devhelp r1153 - in trunk: . src

[rhult svn gnome org]

Author: rhult
Date: Mon Oct  6 17:14:25 2008
New Revision: 1153
URL: http://svn.gnome.org/viewvc/devhelp?rev=1153&view=rev

Log:
2008-10-06  Richard Hult  <richard imendio com>

	* src/dh-preferences.c: (dh_preferences_show_dialog):
	* src/dh-util.[ch]: Rename dh_glade_* to dh_util_glade for
	consistency.


Modified:
   trunk/ChangeLog
   trunk/src/dh-preferences.c
   trunk/src/dh-util.c
   trunk/src/dh-util.h

Modified: trunk/src/dh-preferences.c
==============================================================================
--- trunk/src/dh-preferences.c	(original)
+++ trunk/src/dh-preferences.c	Mon Oct  6 17:14:25 2008
@@ -296,7 +296,6 @@
 	preferences_connect_conf_listeners ();
 }
 
-
 void
 dh_preferences_show_dialog (GtkWindow *parent)
 {
@@ -307,14 +306,11 @@
         preferences_init ();
 
 	if (prefs->dialog != NULL) {
-		/* Do something useful, although it should be visible at
-		 * this point anyway.
-		 */
 		gtk_window_present (GTK_WINDOW (prefs->dialog));
 		return;
 	}
 
-	gui = dh_glade_get_file (
+	gui = dh_util_glade_get_file (
                 DATADIR "/devhelp/devhelp.glade",
                 "preferences_dialog",
                 NULL,
@@ -325,7 +321,7 @@
                 "fixed_font_button", &prefs->fixed_font_button,
                 NULL);
 
-	dh_glade_connect (
+	dh_util_glade_connect (
                 gui,
                 prefs,
                 "variable_font_button", "font_set", preferences_font_set_cb,

Modified: trunk/src/dh-util.c
==============================================================================
--- trunk/src/dh-util.c	(original)
+++ trunk/src/dh-util.c	Mon Oct  6 17:14:25 2008
@@ -57,11 +57,11 @@
 }
 
 GladeXML *
-dh_glade_get_file (const gchar *filename,
-                   const gchar *root,
-                   const gchar *domain,
-                   const gchar *first_required_widget,
-                   ...)
+dh_util_glade_get_file (const gchar *filename,
+                        const gchar *root,
+                        const gchar *domain,
+                        const gchar *first_required_widget,
+                        ...)
 {
         va_list   args;
         GladeXML *gui;
@@ -78,10 +78,10 @@
 }
 
 void
-dh_glade_connect (GladeXML *gui,
-                  gpointer  user_data,
-                  gchar    *first_widget,
-                  ...)
+dh_util_glade_connect (GladeXML *gui,
+                       gpointer  user_data,
+                       gchar    *first_widget,
+                       ...)
 {
         va_list      args;
         const gchar *name;

Modified: trunk/src/dh-util.h
==============================================================================
--- trunk/src/dh-util.h	(original)
+++ trunk/src/dh-util.h	Mon Oct  6 17:14:25 2008
@@ -24,15 +24,15 @@
 
 #include <glade/glade.h>
 
-GladeXML *dh_glade_get_file      (const gchar *filename,
-                                  const gchar *root,
-                                  const gchar *domain,
-                                  const gchar *first_required_widget,
-                                  ...);
-void      dh_glade_connect       (GladeXML    *gui,
-                                  gpointer     user_data,
-                                  gchar       *first_widget,
-                                  ...);
+GladeXML *dh_util_glade_get_file      (const gchar *filename,
+                                       const gchar *root,
+                                       const gchar *domain,
+                                       const gchar *first_required_widget,
+                                       ...);
+void      dh_util_glade_connect       (GladeXML    *gui,
+                                       gpointer     user_data,
+                                       gchar       *first_widget,
+                                       ...);
 gchar *   dh_util_build_data_filename (const gchar *first_part,
                                        ...);