# HG changeset patch # User rosfran # Date 1165031680 0 # Node ID b3904bc4ac6ddecb1657a1a78d69352aadbed660 # Parent 85b47c66a241680da9dcd7df66c395afb18ad027 [svn r179] New functions, when setting the 'path' field in the URI. diff -r 85b47c66a241 -r b3904bc4ac6d gmyth/src/gmyth_backendinfo.c --- a/gmyth/src/gmyth_backendinfo.c Sat Dec 02 03:46:17 2006 +0000 +++ b/gmyth/src/gmyth_backendinfo.c Sat Dec 02 03:54:40 2006 +0000 @@ -52,9 +52,10 @@ { backend_info->hostname = NULL; backend_info->username = NULL; - backend_info->password = NULL; + backend_info->password = NULL; backend_info->db_name = NULL; backend_info->port = -1; + backend_info->path = NULL; } static void @@ -66,12 +67,14 @@ g_free (backend_info->username); g_free (backend_info->password); g_free (backend_info->db_name); + g_free (backend_info->path); backend_info->hostname = NULL; backend_info->username = NULL; backend_info->password = NULL; backend_info->db_name = NULL; backend_info->port = -1; + backend_info->path = NULL; G_OBJECT_CLASS (gmyth_backend_info_parent_class)->dispose (object); } @@ -98,8 +101,8 @@ } GMythBackendInfo* -gmyth_backend_info_new_full (const char *hostname, const char *username, - const char *password, const char *db_name, gint port) +gmyth_backend_info_new_full (const gchar *hostname, const gchar *username, + const gchar *password, const gchar *db_name, gint port) { GMythBackendInfo *backend_info = GMYTH_BACKEND_INFO (g_object_new(GMYTH_BACKEND_INFO_TYPE, NULL)); @@ -119,26 +122,29 @@ GMythBackendInfo *backend_info = GMYTH_BACKEND_INFO (g_object_new(GMYTH_BACKEND_INFO_TYPE, NULL)); -printf ("XXX %s %d\n", __FUNCTION__, __LINE__); + gmyth_debug ("XXX %s %d\n", __FUNCTION__, __LINE__); GMythURI* uri = gmyth_uri_new_with_value( uri_str ); -printf ("XXX %s %d\n", __FUNCTION__, __LINE__); + gmyth_debug ("XXX %s %d\n", __FUNCTION__, __LINE__); gmyth_backend_info_set_hostname (backend_info, gmyth_uri_get_host (uri ) ); -printf ("XXX %s %d \n", __FUNCTION__, __LINE__); + gmyth_debug ("%s\n", gmyth_uri_get_host (uri )); gmyth_backend_info_set_username (backend_info, gmyth_uri_get_user( uri ) ); -printf ("XXX %s %d\n", __FUNCTION__, __LINE__); + gmyth_debug ("%s\n", gmyth_uri_get_user( uri )); gmyth_backend_info_set_password (backend_info, gmyth_uri_get_password( uri ) ); -printf ("XXX %s %d\n", __FUNCTION__, __LINE__); + gmyth_debug ("%s\n", gmyth_uri_get_password( uri )); gmyth_backend_info_set_db_name (backend_info, strlen( gmyth_uri_get_fragment( uri ) ) > 0 ? gmyth_uri_get_fragment( uri ) : gmyth_uri_get_query( uri ) ); gmyth_backend_info_set_port (backend_info, gmyth_uri_get_port( uri ) ); -printf ("XXX %s %d\n", __FUNCTION__, __LINE__); + gmyth_debug ("%s\n", gmyth_backend_info_get_db_name(backend_info) ); + + gmyth_backend_info_set_path (backend_info, gmyth_uri_get_path( uri ) ); + gmyth_debug ("%s\n", gmyth_backend_info_get_path(backend_info) ); return backend_info; } void -gmyth_backend_info_set_hostname (GMythBackendInfo *backend_info, const char *hostname) +gmyth_backend_info_set_hostname (GMythBackendInfo *backend_info, const gchar *hostname) { g_return_if_fail (backend_info != NULL); @@ -146,7 +152,7 @@ } void -gmyth_backend_info_set_username (GMythBackendInfo *backend_info, const char *username) +gmyth_backend_info_set_username (GMythBackendInfo *backend_info, const gchar *username) { g_return_if_fail (backend_info != NULL); @@ -154,7 +160,7 @@ } void -gmyth_backend_info_set_password (GMythBackendInfo *backend_info, const char *password) +gmyth_backend_info_set_password (GMythBackendInfo *backend_info, const gchar *password) { g_return_if_fail (backend_info != NULL); @@ -162,7 +168,7 @@ } void -gmyth_backend_info_set_db_name (GMythBackendInfo *backend_info, const char *db_name) +gmyth_backend_info_set_db_name (GMythBackendInfo *backend_info, const gchar *db_name) { g_return_if_fail (backend_info != NULL); @@ -177,7 +183,15 @@ backend_info->port = port; } -char* +void +gmyth_backend_info_set_path (GMythBackendInfo *backend_info, const gchar *path) +{ + g_return_if_fail (backend_info != NULL); + + backend_info->path = g_strdup (path); +} + +gchar* gmyth_backend_info_get_hostname (GMythBackendInfo *backend_info) { g_return_val_if_fail (backend_info != NULL, NULL); @@ -185,7 +199,7 @@ return backend_info->hostname; } -char* +gchar* gmyth_backend_info_get_username (GMythBackendInfo *backend_info) { g_return_val_if_fail (backend_info != NULL, NULL); @@ -193,7 +207,7 @@ return backend_info->username; } -char* +gchar* gmyth_backend_info_get_password (GMythBackendInfo *backend_info) { g_return_val_if_fail (backend_info != NULL, NULL); @@ -201,7 +215,7 @@ return backend_info->password; } -char* +gchar* gmyth_backend_info_get_db_name (GMythBackendInfo *backend_info) { g_return_val_if_fail (backend_info != NULL, NULL); @@ -216,3 +230,11 @@ return backend_info->port; } + +gchar* +gmyth_backend_info_get_path (GMythBackendInfo *backend_info) +{ + g_return_val_if_fail (backend_info != NULL, NULL); + + return backend_info->path; +} diff -r 85b47c66a241 -r b3904bc4ac6d gmyth/src/gmyth_backendinfo.h --- a/gmyth/src/gmyth_backendinfo.h Sat Dec 02 03:46:17 2006 +0000 +++ b/gmyth/src/gmyth_backendinfo.h Sat Dec 02 03:54:40 2006 +0000 @@ -59,6 +59,7 @@ gchar *password; gchar *db_name; gint port; + gchar *path; }; @@ -66,22 +67,23 @@ GMythBackendInfo* gmyth_backend_info_new (); GMythBackendInfo* gmyth_backend_info_new_full ( - const char *hostname, const char *username, const char *password, - const char *db_name, gint port); + const gchar *hostname, const gchar *username, const gchar *password, + const gchar *db_name, gint port); GMythBackendInfo* gmyth_backend_info_new_with_uri (const gchar *uri_str ); -void gmyth_backend_info_set_hostname (GMythBackendInfo *backend_info, const char *hostname); -void gmyth_backend_info_set_username (GMythBackendInfo *backend_info, const char *username); -void gmyth_backend_info_set_password (GMythBackendInfo *backend_info, const char *password); -void gmyth_backend_info_set_db_name (GMythBackendInfo *backend_info, const char *db_name); +void gmyth_backend_info_set_hostname (GMythBackendInfo *backend_info, const gchar *hostname); +void gmyth_backend_info_set_username (GMythBackendInfo *backend_info, const gchar *username); +void gmyth_backend_info_set_password (GMythBackendInfo *backend_info, const gchar *password); +void gmyth_backend_info_set_db_name (GMythBackendInfo *backend_info, const gchar *db_name); void gmyth_backend_info_set_port (GMythBackendInfo *backend_info, gint port); +void gmyth_backend_info_set_path (GMythBackendInfo *backend_info, const gchar *path); -char* gmyth_backend_info_get_hostname (GMythBackendInfo *backend_info); -char* gmyth_backend_info_get_username (GMythBackendInfo *backend_info); -char* gmyth_backend_info_get_password (GMythBackendInfo *backend_info); -char* gmyth_backend_info_get_db_name (GMythBackendInfo *backend_info); +gchar* gmyth_backend_info_get_hostname (GMythBackendInfo *backend_info); +gchar* gmyth_backend_info_get_username (GMythBackendInfo *backend_info); +gchar* gmyth_backend_info_get_password (GMythBackendInfo *backend_info); +gchar* gmyth_backend_info_get_db_name (GMythBackendInfo *backend_info); gint gmyth_backend_info_get_port (GMythBackendInfo *backend_info); - +gchar* gmyth_backend_info_get_path (GMythBackendInfo *backend_info); G_END_DECLS