GNOME.org
 

gnome-control-center r9098 - in trunk: . capplets/appearance capplets/common capplets/keybindings capplets/keyboard capplets/mouse capplets/sound

Author: ssp
Date: Fri Oct 24 21:19:15 2008
New Revision: 9098
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9098&view=rev

Log:
+Fri Oct 24 17:17:47 2008  SÃren Sandmann  <sandmann redhat com>
+
+	* Get rid of a number of unnecessary gnome.h includes
+
+	* capplets/keybindings/gnome-keybinding-properties.c: Use
+	gtk_init() instead of gnome_program_init().
+
+	* A couple of formatting fixes
+



Modified:
   trunk/ChangeLog
   trunk/capplets/appearance/appearance-desktop.c
   trunk/capplets/appearance/appearance-font.c
   trunk/capplets/appearance/appearance-style.c
   trunk/capplets/appearance/appearance-themes.c
   trunk/capplets/appearance/appearance.h
   trunk/capplets/appearance/gnome-wp-info.c
   trunk/capplets/appearance/gnome-wp-info.h
   trunk/capplets/appearance/gnome-wp-item.c
   trunk/capplets/appearance/gnome-wp-item.h
   trunk/capplets/appearance/theme-installer.c
   trunk/capplets/appearance/theme-save.c
   trunk/capplets/common/theme-thumbnail.c
   trunk/capplets/keybindings/gnome-keybinding-properties.c
   trunk/capplets/keyboard/gnome-keyboard-properties-xkb.c
   trunk/capplets/keyboard/gnome-keyboard-properties-xkblt.c
   trunk/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c
   trunk/capplets/keyboard/gnome-keyboard-properties-xkbmc.c
   trunk/capplets/keyboard/gnome-keyboard-properties-xkbot.c
   trunk/capplets/keyboard/gnome-keyboard-properties-xkbpv.c
   trunk/capplets/mouse/gnome-mouse-accessibility.c
   trunk/capplets/sound/pipeline-tests.c

Modified: trunk/capplets/appearance/appearance-desktop.c
==============================================================================
--- trunk/capplets/appearance/appearance-desktop.c	(original)
+++ trunk/capplets/appearance/appearance-desktop.c	Fri Oct 24 21:19:15 2008
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <gconf/gconf-client.h>
 #include <libgnomeui/gnome-desktop-thumbnail.h>
-#define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-bg.h>
 
 enum {
@@ -859,8 +858,8 @@
     if (mime_type)
     {
       pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (data->thumb_factory,
-                                                           uri,
-                                                           mime_type);
+								   uri,
+								   mime_type);
     }
 
     if (pixbuf != NULL)

Modified: trunk/capplets/appearance/appearance-font.c
==============================================================================
--- trunk/capplets/appearance/appearance-font.c	(original)
+++ trunk/capplets/appearance/appearance-font.c	Fri Oct 24 21:19:15 2008
@@ -29,6 +29,7 @@
 #include <gdk/gdkx.h>
 #include <X11/Xft/Xft.h>
 #endif /* HAVE_XFT2 */
+#include <glib/gi18n.h>
 
 #include "capplet-util.h"
 #include "gconf-property-editor.h"

Modified: trunk/capplets/appearance/appearance-style.c
==============================================================================
--- trunk/capplets/appearance/appearance-style.c	(original)
+++ trunk/capplets/appearance/appearance-style.c	Fri Oct 24 21:19:15 2008
@@ -21,6 +21,7 @@
 
 #include <string.h>
 #include <pango/pango.h>
+#include <glib/gi18n.h>
 
 #include "theme-util.h"
 #include "gtkrc-utils.h"

Modified: trunk/capplets/appearance/appearance-themes.c
==============================================================================
--- trunk/capplets/appearance/appearance-themes.c	(original)
+++ trunk/capplets/appearance/appearance-themes.c	Fri Oct 24 21:19:15 2008
@@ -113,7 +113,7 @@
       path = g_strconcat ("themes:///", theme_name, NULL);
 
       gnome_desktop_thumbnail_factory_save_thumbnail (data->thumb_factory,
-					      pixbuf, path, mtime);
+						      pixbuf, path, mtime);
 
       g_free (path);
     }
@@ -137,7 +137,7 @@
   /* try to share thumbs with nautilus, use themes:/// */
   path = g_strconcat ("themes:///", info->name, NULL);
   thumb_filename = gnome_desktop_thumbnail_factory_lookup (data->thumb_factory,
-                                                   path, mtime);
+							   path, mtime);
   g_free (path);
 
   if (thumb_filename != NULL) {

Modified: trunk/capplets/appearance/appearance.h
==============================================================================
--- trunk/capplets/appearance/appearance.h	(original)
+++ trunk/capplets/appearance/appearance.h	Fri Oct 24 21:19:15 2008
@@ -24,6 +24,7 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <gconf/gconf-client.h>
+#define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-desktop-thumbnail.h>
 
 #include "gnome-theme-info.h"

Modified: trunk/capplets/appearance/gnome-wp-info.c
==============================================================================
--- trunk/capplets/appearance/gnome-wp-info.c	(original)
+++ trunk/capplets/appearance/gnome-wp-info.c	Fri Oct 24 21:19:15 2008
@@ -65,9 +65,8 @@
                                                   G_FILE_ATTRIBUTE_TIME_MODIFIED);
 
     wp->thumburi = gnome_desktop_thumbnail_factory_lookup (thumbs,
-						   uri,
-						   wp->mtime);
-
+							   uri,
+							   wp->mtime);
   }
 
   if (info != NULL)

Modified: trunk/capplets/appearance/gnome-wp-info.h
==============================================================================
--- trunk/capplets/appearance/gnome-wp-info.h	(original)
+++ trunk/capplets/appearance/gnome-wp-info.h	Fri Oct 24 21:19:15 2008
@@ -22,6 +22,7 @@
 #define _GNOME_WP_INFO_H_
 
 #include <glib.h>
+#define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-desktop-thumbnail.h>
 
 typedef struct _GnomeWPInfo GnomeWPInfo;

Modified: trunk/capplets/appearance/gnome-wp-item.c
==============================================================================
--- trunk/capplets/appearance/gnome-wp-item.c	(original)
+++ trunk/capplets/appearance/gnome-wp-item.c	Fri Oct 24 21:19:15 2008
@@ -22,7 +22,6 @@
 
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
-#include <gnome.h>
 #include <string.h>
 #include "gnome-wp-item.h"
 

Modified: trunk/capplets/appearance/gnome-wp-item.h
==============================================================================
--- trunk/capplets/appearance/gnome-wp-item.h	(original)
+++ trunk/capplets/appearance/gnome-wp-item.h	Fri Oct 24 21:19:15 2008
@@ -22,8 +22,8 @@
 #include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtktreeview.h>
-#include <libgnomeui/gnome-desktop-thumbnail.h>
 #define GNOME_DESKTOP_USE_UNSTABLE_API
+#include <libgnomeui/gnome-desktop-thumbnail.h>
 #include <libgnomeui/gnome-bg.h>
 
 #include "gnome-wp-info.h"

Modified: trunk/capplets/appearance/theme-installer.c
==============================================================================
--- trunk/capplets/appearance/theme-installer.c	(original)
+++ trunk/capplets/appearance/theme-installer.c	Fri Oct 24 21:19:15 2008
@@ -27,6 +27,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <glib/gstdio.h>
+#include <unistd.h>
 
 #include "capplet-util.h"
 #include "file-transfer-dialog.h"

Modified: trunk/capplets/appearance/theme-save.c
==============================================================================
--- trunk/capplets/appearance/theme-save.c	(original)
+++ trunk/capplets/appearance/theme-save.c	Fri Oct 24 21:19:15 2008
@@ -22,6 +22,8 @@
 #include "appearance.h"
 
 #include <glib/gstdio.h>
+#include <glib/gi18n.h>
+#include <string.h>
 
 #include "theme-save.h"
 #include "theme-util.h"

Modified: trunk/capplets/common/theme-thumbnail.c
==============================================================================
--- trunk/capplets/common/theme-thumbnail.c	(original)
+++ trunk/capplets/common/theme-thumbnail.c	Fri Oct 24 21:19:15 2008
@@ -14,7 +14,6 @@
 #undef N_
 
 #include <glib.h>
-#include <libgnomeui/gnome-icon-theme.h>
 
 #include "theme-thumbnail.h"
 #include "gtkrc-utils.h"

Modified: trunk/capplets/keybindings/gnome-keybinding-properties.c
==============================================================================
--- trunk/capplets/keybindings/gnome-keybinding-properties.c	(original)
+++ trunk/capplets/keybindings/gnome-keybinding-properties.c	Fri Oct 24 21:19:15 2008
@@ -10,6 +10,8 @@
 #include <gdk/gdkx.h>
 #include <glade/glade.h>
 #include <X11/Xatom.h>
+#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "wm-common.h"
 #include "capplet-util.h"
@@ -1464,7 +1466,6 @@
 int
 main (int argc, char *argv[])
 {
-  GnomeProgram *program;
   GladeXML *dialog;
 
   g_thread_init (NULL);
@@ -1474,10 +1475,7 @@
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  program = gnome_program_init ("gnome-keybinding-properties", VERSION,
-		      LIBGNOMEUI_MODULE, argc, argv,
-		      GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
-		      NULL);
+  gtk_init (&argc, &argv);
 
   activate_settings_daemon ();
 
@@ -1488,7 +1486,6 @@
   gtk_main ();
 
   g_object_unref (dialog);
-  g_object_unref (program);
   return 0;
 }
 

Modified: trunk/capplets/keyboard/gnome-keyboard-properties-xkb.c
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties-xkb.c	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties-xkb.c	Fri Oct 24 21:19:15 2008
@@ -25,10 +25,11 @@
 #  include <config.h>
 #endif
 
-#include <gnome.h>
+#include <string.h>
 #include <gdk/gdkx.h>
 #include <gconf/gconf-client.h>
 #include <glade/glade.h>
+#include <glib/gi18n.h>
 
 #include "capplet-util.h"
 #include "gconf-property-editor.h"

Modified: trunk/capplets/keyboard/gnome-keyboard-properties-xkblt.c
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties-xkblt.c	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties-xkblt.c	Fri Oct 24 21:19:15 2008
@@ -25,9 +25,9 @@
 #  include <config.h>
 #endif
 
-#include <gnome.h>
 #include <gconf/gconf-client.h>
 #include <glade/glade.h>
+#include <glib/gi18n.h>
 
 #include <libgnomekbd/gkbd-desktop-config.h>
 #include <libgnomekbd/gkbd-keyboard-drawing.h>

Modified: trunk/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c	Fri Oct 24 21:19:15 2008
@@ -27,7 +27,6 @@
 
 #include <string.h>
 
-#include <gnome.h>
 #include <glade/glade.h>
 
 #include <libgnomekbd/gkbd-keyboard-drawing.h>

Modified: trunk/capplets/keyboard/gnome-keyboard-properties-xkbmc.c
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties-xkbmc.c	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties-xkbmc.c	Fri Oct 24 21:19:15 2008
@@ -25,10 +25,10 @@
 #  include <config.h>
 #endif
 
-#include <gnome.h>
 #include <gdk/gdkx.h>
 #include <gconf/gconf-client.h>
 #include <glade/glade.h>
+#include <glib/gi18n.h>
 
 #include "capplet-util.h"
 

Modified: trunk/capplets/keyboard/gnome-keyboard-properties-xkbot.c
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties-xkbot.c	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties-xkbot.c	Fri Oct 24 21:19:15 2008
@@ -26,7 +26,8 @@
 #  include <config.h>
 #endif
 
-#include <gnome.h>
+#include <glib/gi18n.h>
+#include <string.h>
 #include <gconf/gconf-client.h>
 #include <glade/glade.h>
 

Modified: trunk/capplets/keyboard/gnome-keyboard-properties-xkbpv.c
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties-xkbpv.c	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties-xkbpv.c	Fri Oct 24 21:19:15 2008
@@ -25,7 +25,6 @@
 #  include <config.h>
 #endif
 
-#include <gnome.h>
 #include <glade/glade.h>
 
 #include <libgnomekbd/gkbd-keyboard-drawing.h>

Modified: trunk/capplets/mouse/gnome-mouse-accessibility.c
==============================================================================
--- trunk/capplets/mouse/gnome-mouse-accessibility.c	(original)
+++ trunk/capplets/mouse/gnome-mouse-accessibility.c	Fri Oct 24 21:19:15 2008
@@ -17,6 +17,7 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
+#include <glib/gi18n.h>
 
 #include "capplet-util.h"
 #include "gconf-property-editor.h"

Modified: trunk/capplets/sound/pipeline-tests.c
==============================================================================
--- trunk/capplets/sound/pipeline-tests.c	(original)
+++ trunk/capplets/sound/pipeline-tests.c	Fri Oct 24 21:19:15 2008
@@ -29,10 +29,10 @@
 
 #include <locale.h>
 #include <string.h>
-#include <gnome.h>
 #include <glade/glade.h>
 #include <gtk/gtk.h>
 #include <gst/gst.h>
+#include <glib/gi18n.h>
 
 #include "pipeline-tests.h"
 #define WID(s) glade_xml_get_widget (interface_xml, s)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]