+Fri Oct 24 18:31:25 2008 Søren Sandmann <sandmann@redhat.com>

+
+	* main.c (main): Use capplet_init() instead of gnome_program_init()
+
+Fri Oct 24 18:46:11 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* appearance-main.c: Get rid of gnome includes
+
+Fri Oct 24 18:32:16 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* appearance-main.c (main): Use capplet_init()
+


svn path=/trunk/; revision=9109

capplets/about-me/gnome-about-me.c

@@ -1027,14 +1027,7 @@ main (int argc, char **argv)
 	GnomeProgram *program;
 	int rc = 0;
 
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	capplet_init (NULL, &argc, &argv);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	program = gnome_program_init ("gnome-about-me", VERSION,
-			LIBGNOMEUI_MODULE, argc, argv,
-			GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
-			NULL);
 
 	rc = about_me_setup_dialog ();
 
@@ -1042,7 +1035,5 @@ main (int argc, char **argv)
 		gtk_main ();
 	}
 
-	g_object_unref (program);
-
 	return rc;
 }

capplets/accessibility/at-properties/ChangeLog

@@ -1,3 +1,7 @@
+Fri Oct 24 18:31:25 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* main.c (main): Use capplet_init() instead of gnome_program_init()
+
 ==================== 2.24.0.1 ====================
 
 2008-08-23  Jens Granseuer  <jensgr@gmx.net>

capplets/accessibility/at-properties/main.c

@@ -201,17 +201,9 @@ setup_dialog (GladeXML *dialog)
 int
 main (int argc, char *argv[])
 {
-	GnomeProgram *program;
 	GladeXML *dialog;
 
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	capplet_init (NULL, &argc, &argv);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	program = gnome_program_init ("gnome-at-properties", VERSION,
-				      LIBGNOMEUI_MODULE, argc, argv,
-				      GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
-				      NULL);
 
 	activate_settings_daemon ();
 
@@ -226,7 +218,5 @@ main (int argc, char *argv[])
 		g_object_unref (dialog);
 	}
 
-	g_object_unref (program);
-
 	return 0;
 }

capplets/appearance/ChangeLog

@@ -1,3 +1,11 @@
+Fri Oct 24 18:46:11 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* appearance-main.c: Get rid of gnome includes
+
+Fri Oct 24 18:32:16 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* appearance-main.c (main): Use capplet_init()
+
 2008-10-11  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* appearance-font.c: (application_font_to_gconf):

capplets/appearance/appearance-main.c

@@ -29,10 +29,6 @@
 #include "activate-settings-daemon.h"
 #include "capplet-util.h"
 
-/* required for gnome_program_init(): */
-#include <libgnome/libgnome.h>
-#include <libgnomeui/gnome-ui-init.h>
-/* ---------------------------------- */
 #include <libgnomeui/gnome-desktop-thumbnail.h>
 
 static AppearanceData *
@@ -118,7 +114,6 @@ int
 main (int argc, char **argv)
 {
   AppearanceData *data;
-  GnomeProgram *program;
   GtkWidget *w;
 
   gchar *install_filename = NULL;
@@ -159,15 +154,7 @@ main (int argc, char **argv)
   option_context = g_option_context_new (NULL);
   g_option_context_add_main_entries (option_context, option_entries, GETTEXT_PACKAGE);
 
-  /* this appears to be required for gnome_wm_manager_init (), which is called
+  capplet_init (option_context, &argc, &argv);
-   * inside gnome_meta_theme_set ();
-   * TODO: try to remove if possible
-   */
-  program = gnome_program_init ("appearance", VERSION,
-        LIBGNOMEUI_MODULE, argc, argv,
-        GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
-        GNOME_PARAM_GOPTION_CONTEXT, option_context,
-        NULL);
 
   if (install_filename != NULL) {
     GFile *inst = g_file_new_for_commandline_arg (install_filename);
@@ -220,7 +207,6 @@ main (int argc, char **argv)
 
   /* free stuff */
   g_free (data);
-  g_object_unref (program);
 
   return 0;
 }

capplets/keyboard/gnome-keyboard-properties.c

@@ -266,19 +266,12 @@ main (int argc, char **argv)
 		{NULL}
 	};
 
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
 	
 	context = g_option_context_new (_("- GNOME Keyboard Preferences"));
 	g_option_context_add_main_entries (context, cap_options,
 					   GETTEXT_PACKAGE);
 
-	gnome_program_init ("gnome-keyboard-properties", VERSION,
+	capplet_init (context, &argc, &argv);
-			    LIBGNOMEUI_MODULE, argc, argv,
-			    GNOME_PARAM_GOPTION_CONTEXT, context,
-			    GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
-			    NULL);
 
 	activate_settings_daemon ();
 

capplets/localization/main.c

@@ -39,17 +39,9 @@ create_dialog (void)
 int
 main (int argc, char *argv[])
 {
-	GnomeProgram *program;
 	GtkWidget *dialog;
 
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	capplet_init (NULL, &argc, &argv);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	program = gnome_program_init ("gnome-localization-properties", VERSION,
-				      LIBGNOMEUI_MODULE, argc, argv,
-				      GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
-				      NULL);
 
 	/* open main dialog */
 	dialog = create_dialog ();
@@ -57,7 +49,6 @@ main (int argc, char *argv[])
 	gtk_widget_show (dialog);
 
 	gtk_main ();
-	g_object_unref (program);
 
 	return 0;
 }