diff options
Diffstat (limited to 'libempathy-gtk/empathy-ui-utils.c')
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 23875f722..9c66e73ba 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -53,13 +53,17 @@ struct SizeData { gboolean preserve_aspect_ratio; }; -GladeXML * -empathy_glade_get (const gchar *filename, - const gchar *root, - const gchar *domain) +static GladeXML * +get_glade_file (const gchar *filename, + const gchar *root, + const gchar *domain, + const gchar *first_required_widget, + va_list args) { - GladeXML *gui; - gchar *path; + GladeXML *gui; + gchar *path; + const char *name; + GtkWidget **widget_ptr; path = g_build_filename (UNINSTALLED_GLADE_DIR, filename, NULL); if (!g_file_test (path, G_FILE_TEST_EXISTS)) { @@ -75,22 +79,6 @@ empathy_glade_get (const gchar *filename, g_warning ("Couldn't find necessary glade file '%s'", filename); } - return gui; -} - -static GladeXML * -get_glade_file (const gchar *filename, - const gchar *root, - const gchar *domain, - const gchar *first_required_widget, - va_list args) -{ - GladeXML *gui; - const char *name; - GtkWidget **widget_ptr; - - gui = empathy_glade_get (filename, root, domain); - for (name = first_required_widget; name; name = va_arg (args, char *)) { widget_ptr = va_arg (args, void *); |