diff options
22 files changed, 34 insertions, 24 deletions
@@ -1,3 +1,12 @@ +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 + Fri Oct 24 15:42:11 2008 Søren Sandmann <sandmann@redhat.com> * Use gtk_show_uri() instead of gnome_help_display_desktop() diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c index 847e85d9e..bb220b85f 100644 --- a/capplets/appearance/appearance-desktop.c +++ b/capplets/appearance/appearance-desktop.c @@ -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 @@ wp_update_preview (GtkFileChooser *chooser, if (mime_type) { pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (data->thumb_factory, - uri, - mime_type); + uri, + mime_type); } if (pixbuf != NULL) diff --git a/capplets/appearance/appearance-font.c b/capplets/appearance/appearance-font.c index 60e3062a5..26888ded8 100644 --- a/capplets/appearance/appearance-font.c +++ b/capplets/appearance/appearance-font.c @@ -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" diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index b9c08a15d..1fa9c0939 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -21,6 +21,7 @@ #include <string.h> #include <pango/pango.h> +#include <glib/gi18n.h> #include "theme-util.h" #include "gtkrc-utils.h" diff --git a/capplets/appearance/appearance-themes.c b/capplets/appearance/appearance-themes.c index b0f5b4bad..3b8a2cdaf 100644 --- a/capplets/appearance/appearance-themes.c +++ b/capplets/appearance/appearance-themes.c @@ -113,7 +113,7 @@ theme_thumbnail_update (GdkPixbuf *pixbuf, 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 @@ theme_get_thumbnail_from_cache (GnomeThemeMetaInfo *info, AppearanceData *data) /* 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) { diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h index cfdbe1f07..b8a7e619e 100644 --- a/capplets/appearance/appearance.h +++ b/capplets/appearance/appearance.h @@ -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" diff --git a/capplets/appearance/gnome-wp-info.c b/capplets/appearance/gnome-wp-info.c index 597caa369..7b12ea387 100644 --- a/capplets/appearance/gnome-wp-info.c +++ b/capplets/appearance/gnome-wp-info.c @@ -65,9 +65,8 @@ GnomeWPInfo * gnome_wp_info_new (const gchar * uri, G_FILE_ATTRIBUTE_TIME_MODIFIED); wp->thumburi = gnome_desktop_thumbnail_factory_lookup (thumbs, - uri, - wp->mtime); - + uri, + wp->mtime); } if (info != NULL) diff --git a/capplets/appearance/gnome-wp-info.h b/capplets/appearance/gnome-wp-info.h index ea1051e28..54105a8f7 100644 --- a/capplets/appearance/gnome-wp-info.h +++ b/capplets/appearance/gnome-wp-info.h @@ -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; diff --git a/capplets/appearance/gnome-wp-item.c b/capplets/appearance/gnome-wp-item.c index f5b498d83..4e40b07a3 100644 --- a/capplets/appearance/gnome-wp-item.c +++ b/capplets/appearance/gnome-wp-item.c @@ -22,7 +22,6 @@ #include <glib/gi18n.h> #include <gconf/gconf-client.h> -#include <gnome.h> #include <string.h> #include "gnome-wp-item.h" diff --git a/capplets/appearance/gnome-wp-item.h b/capplets/appearance/gnome-wp-item.h index 49c1de0ea..635e081a1 100644 --- a/capplets/appearance/gnome-wp-item.h +++ b/capplets/appearance/gnome-wp-item.h @@ -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" diff --git a/capplets/appearance/theme-installer.c b/capplets/appearance/theme-installer.c index a3bf73504..9922ad5f3 100644 --- a/capplets/appearance/theme-installer.c +++ b/capplets/appearance/theme-installer.c @@ -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" diff --git a/capplets/appearance/theme-save.c b/capplets/appearance/theme-save.c index 24507384a..5dec24eab 100644 --- a/capplets/appearance/theme-save.c +++ b/capplets/appearance/theme-save.c @@ -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" diff --git a/capplets/common/theme-thumbnail.c b/capplets/common/theme-thumbnail.c index 8827b5a0b..440b25a4c 100644 --- a/capplets/common/theme-thumbnail.c +++ b/capplets/common/theme-thumbnail.c @@ -14,7 +14,6 @@ #undef N_ #include <glib.h> -#include <libgnomeui/gnome-icon-theme.h> #include "theme-thumbnail.h" #include "gtkrc-utils.h" diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index b78731977..e05c86fb7 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -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 @@ setup_dialog (GladeXML *dialog) int main (int argc, char *argv[]) { - GnomeProgram *program; GladeXML *dialog; g_thread_init (NULL); @@ -1474,10 +1475,7 @@ main (int argc, char *argv[]) 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 @@ main (int argc, char *argv[]) gtk_main (); g_object_unref (dialog); - g_object_unref (program); return 0; } diff --git a/capplets/keyboard/gnome-keyboard-properties-xkb.c b/capplets/keyboard/gnome-keyboard-properties-xkb.c index c025ee49e..a0171ac0c 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkb.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkb.c @@ -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" diff --git a/capplets/keyboard/gnome-keyboard-properties-xkblt.c b/capplets/keyboard/gnome-keyboard-properties-xkblt.c index 8612969df..195df59d5 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkblt.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkblt.c @@ -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> diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c b/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c index 840a9cda2..225eb1426 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c @@ -27,7 +27,6 @@ #include <string.h> -#include <gnome.h> #include <glade/glade.h> #include <libgnomekbd/gkbd-keyboard-drawing.h> diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbmc.c b/capplets/keyboard/gnome-keyboard-properties-xkbmc.c index f90ad3aa4..bd9fc8e4a 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbmc.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbmc.c @@ -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" diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbot.c b/capplets/keyboard/gnome-keyboard-properties-xkbot.c index c6fe611e8..1daa67be5 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbot.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbot.c @@ -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> diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbpv.c b/capplets/keyboard/gnome-keyboard-properties-xkbpv.c index e243233c1..4151a52fe 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbpv.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbpv.c @@ -25,7 +25,6 @@ # include <config.h> #endif -#include <gnome.h> #include <glade/glade.h> #include <libgnomekbd/gkbd-keyboard-drawing.h> diff --git a/capplets/mouse/gnome-mouse-accessibility.c b/capplets/mouse/gnome-mouse-accessibility.c index 9d12a1c2b..f7d8f6f3a 100644 --- a/capplets/mouse/gnome-mouse-accessibility.c +++ b/capplets/mouse/gnome-mouse-accessibility.c @@ -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" diff --git a/capplets/sound/pipeline-tests.c b/capplets/sound/pipeline-tests.c index fc84a2ed0..c75b1932b 100644 --- a/capplets/sound/pipeline-tests.c +++ b/capplets/sound/pipeline-tests.c @@ -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) |