1.1 --- a/gmyth/gmyth.pc.in Wed Jan 10 20:51:00 2007 +0000
1.2 +++ b/gmyth/gmyth.pc.in Wed Jan 10 20:52:55 2007 +0000
1.3 @@ -8,5 +8,5 @@
1.4 Version: @VERSION@
1.5 Requires: gobject-2.0 glib-2.0
1.6
1.7 -Libs: @MYSQL_LIBS@ @CYBERLINK_LIBS@ -L${libdir} -lgmyth
1.8 -Cflags: @MYSQL_CFLAGS@ @CYBERLINK_CFLAGS@ -I${includedir}/gmyth
1.9 +Libs: @MYSQL_LIBS@ -L${libdir} -lgmyth
1.10 +Cflags: -I${includedir}/gmyth
2.1 --- a/gmyth/src/gmyth_backendinfo.c Wed Jan 10 20:51:00 2007 +0000
2.2 +++ b/gmyth/src/gmyth_backendinfo.c Wed Jan 10 20:52:55 2007 +0000
2.3 @@ -123,20 +123,14 @@
2.4 GMythBackendInfo *backend_info =
2.5 GMYTH_BACKEND_INFO (g_object_new(GMYTH_BACKEND_INFO_TYPE, NULL));
2.6
2.7 - gmyth_debug ("XXX %s %d\n", __FUNCTION__, __LINE__);
2.8 GMythURI* uri = gmyth_uri_new_with_value( uri_str );
2.9 - gmyth_debug ("XXX %s %d\n", __FUNCTION__, __LINE__);
2.10
2.11 gmyth_backend_info_set_hostname (backend_info, gmyth_uri_get_host (uri ) );
2.12 - gmyth_debug ("%s\n", gmyth_uri_get_host (uri ));
2.13 gmyth_backend_info_set_username (backend_info, gmyth_uri_get_user( uri ) );
2.14 - gmyth_debug ("%s\n", gmyth_uri_get_user( uri ));
2.15 gmyth_backend_info_set_password (backend_info, gmyth_uri_get_password( uri ) );
2.16 - gmyth_debug ("%s\n", gmyth_uri_get_password( uri ));
2.17 gmyth_backend_info_set_db_name (backend_info, strlen( gmyth_uri_get_fragment( uri ) ) > 0
2.18 ? gmyth_uri_get_fragment( uri ) : gmyth_uri_get_query( uri ) );
2.19 gmyth_backend_info_set_port (backend_info, gmyth_uri_get_port( uri ) );
2.20 - gmyth_debug ("%s\n", gmyth_backend_info_get_db_name(backend_info) );
2.21
2.22 return backend_info;
2.23 }
3.1 --- a/gmyth/src/gmyth_query.c Wed Jan 10 20:51:00 2007 +0000
3.2 +++ b/gmyth/src/gmyth_query.c Wed Jan 10 20:52:55 2007 +0000
3.3 @@ -168,14 +168,14 @@
3.4 static void
3.5 gmyth_query_print_error (MYSQL *conn, char *message)
3.6 {
3.7 - fprintf (stderr, "%s\n", message);
3.8 + g_debug ("%s", message);
3.9
3.10 if (conn != NULL) {
3.11 #if MYSQL_VERSION_ID >= 40101
3.12 - fprintf (stderr, "Error %u (%s): %s\n",
3.13 + g_debug ("Error %u (%s): %s\n",
3.14 mysql_errno (conn), mysql_sqlstate(conn), mysql_error (conn));
3.15 #else
3.16 - fprintf (stderr, "Error %u: %s\n",
3.17 + g_debug ("Error %u: %s\n",
3.18 mysql_errno (conn), mysql_error (conn));
3.19 #endif
3.20 }
4.1 --- a/gmyth/src/gmyth_scheduler.c Wed Jan 10 20:51:00 2007 +0000
4.2 +++ b/gmyth/src/gmyth_scheduler.c Wed Jan 10 20:52:55 2007 +0000
4.3 @@ -151,8 +151,8 @@
4.4
4.5 if (scheduler->msqlquery == NULL) {
4.6 g_warning ("[%s] GMythScheduler db initializing", __FUNCTION__);
4.7 - scheduler->msqlquery = gmyth_query_new ();
4.8 - }
4.9 + scheduler->msqlquery = gmyth_query_new ();
4.10 + }
4.11
4.12 if (!gmyth_query_connect(scheduler->msqlquery, scheduler->backend_info)) {
4.13 g_warning ("[%s] Error while connecting to db", __FUNCTION__);
5.1 --- a/gmyth/src/gmyth_socket.c Wed Jan 10 20:51:00 2007 +0000
5.2 +++ b/gmyth/src/gmyth_socket.c Wed Jan 10 20:52:55 2007 +0000
5.3 @@ -525,7 +525,7 @@
5.4 gmyth_debug ("CONNECTING %s:%d", hostname, port);
5.5
5.6 if ( hostname == NULL )
5.7 - gmyth_debug ( "[%s] Invalid hostname parameter!\n", __FUNCTION__ );
5.8 + gmyth_debug ( "[%s] Invalid hostname parameter!\n", __FUNCTION__ );
5.9
5.10 /* store hostname and port number */
5.11 if (gmyth_socket->hostname != NULL) {