gnome-control-center r9109 - in trunk/capplets: about-me accessibility/at-properties appearance keyboard localization

[ssp svn gnome org]

Author: ssp
Date: Fri Oct 24 22:50:58 2008
New Revision: 9109
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9109&view=rev

Log:
+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()
+



Modified:
   trunk/capplets/about-me/gnome-about-me.c
   trunk/capplets/accessibility/at-properties/ChangeLog
   trunk/capplets/accessibility/at-properties/main.c
   trunk/capplets/appearance/ChangeLog
   trunk/capplets/appearance/appearance-main.c
   trunk/capplets/keyboard/gnome-keyboard-properties.c
   trunk/capplets/localization/main.c

Modified: trunk/capplets/about-me/gnome-about-me.c
==============================================================================
--- trunk/capplets/about-me/gnome-about-me.c	(original)
+++ trunk/capplets/about-me/gnome-about-me.c	Fri Oct 24 22:50:58 2008
@@ -1027,14 +1027,7 @@
 	GnomeProgram *program;
 	int rc = 0;
 
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-	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);
+	capplet_init (NULL, &argc, &argv);
 
 	rc = about_me_setup_dialog ();
 
@@ -1042,7 +1035,5 @@
 		gtk_main ();
 	}
 
-	g_object_unref (program);
-
 	return rc;
 }

Modified: trunk/capplets/accessibility/at-properties/main.c
==============================================================================
--- trunk/capplets/accessibility/at-properties/main.c	(original)
+++ trunk/capplets/accessibility/at-properties/main.c	Fri Oct 24 22:50:58 2008
@@ -201,17 +201,9 @@
 int
 main (int argc, char *argv[])
 {
-	GnomeProgram *program;
 	GladeXML *dialog;
 
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-	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);
+	capplet_init (NULL, &argc, &argv);
 
 	activate_settings_daemon ();
 
@@ -226,7 +218,5 @@
 		g_object_unref (dialog);
 	}
 
-	g_object_unref (program);
-
 	return 0;
 }

Modified: trunk/capplets/appearance/appearance-main.c
==============================================================================
--- trunk/capplets/appearance/appearance-main.c	(original)
+++ trunk/capplets/appearance/appearance-main.c	Fri Oct 24 22:50:58 2008
@@ -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 @@
 main (int argc, char **argv)
 {
   AppearanceData *data;
-  GnomeProgram *program;
   GtkWidget *w;
 
   gchar *install_filename = NULL;
@@ -159,15 +154,7 @@
   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
-   * 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);
+  capplet_init (option_context, &argc, &argv);
 
   if (install_filename != NULL) {
     GFile *inst = g_file_new_for_commandline_arg (install_filename);
@@ -220,7 +207,6 @@
 
   /* free stuff */
   g_free (data);
-  g_object_unref (program);
 
   return 0;
 }

Modified: trunk/capplets/keyboard/gnome-keyboard-properties.c
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties.c	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties.c	Fri Oct 24 22:50:58 2008
@@ -266,19 +266,12 @@
 		{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,
-			    LIBGNOMEUI_MODULE, argc, argv,
-			    GNOME_PARAM_GOPTION_CONTEXT, context,
-			    GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
-			    NULL);
+	capplet_init (context, &argc, &argv);
 
 	activate_settings_daemon ();
 

Modified: trunk/capplets/localization/main.c
==============================================================================
--- trunk/capplets/localization/main.c	(original)
+++ trunk/capplets/localization/main.c	Fri Oct 24 22:50:58 2008
@@ -39,17 +39,9 @@
 int
 main (int argc, char *argv[])
 {
-	GnomeProgram *program;
 	GtkWidget *dialog;
 
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-	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);
+	capplet_init (NULL, &argc, &argv);
 
 	/* open main dialog */
 	dialog = create_dialog ();
@@ -57,7 +49,6 @@
 	gtk_widget_show (dialog);
 
 	gtk_main ();
-	g_object_unref (program);
 
 	return 0;
 }