From f12b766e603edfaa5667d5a078d54e8e870a8e92 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 30 Jul 2009 13:33:03 +1000 Subject: [PATCH] Remove all references to Glade Fix up POTFILES.in for new .ui files --- capplets/about-me/gnome-about-me-fingerprint.c | 3 --- capplets/about-me/gnome-about-me-password.c | 3 --- capplets/about-me/gnome-about-me.c | 3 --- capplets/common/capplet-util.h | 4 ++-- .../keyboard/gnome-keyboard-properties-a11y.c | 2 -- .../keyboard/gnome-keyboard-properties-xkb.c | 3 --- .../keyboard/gnome-keyboard-properties-xkblt.c | 3 --- .../gnome-keyboard-properties-xkbltadd.c | 3 --- .../keyboard/gnome-keyboard-properties-xkbmc.c | 3 --- .../keyboard/gnome-keyboard-properties-xkbot.c | 3 --- capplets/keyboard/gnome-keyboard-properties.c | 3 --- capplets/mouse/gnome-mouse-accessibility.c | 3 --- capplets/mouse/gnome-mouse-properties.c | 3 --- configure.in | 4 ++-- po/POTFILES.in | 18 +++++++++--------- 15 files changed, 13 insertions(+), 48 deletions(-) diff --git a/capplets/about-me/gnome-about-me-fingerprint.c b/capplets/about-me/gnome-about-me-fingerprint.c index bb569bf9d..49164be63 100644 --- a/capplets/about-me/gnome-about-me-fingerprint.c +++ b/capplets/about-me/gnome-about-me-fingerprint.c @@ -27,9 +27,6 @@ /* This must match the number of images on the 2nd page in the UI file */ #define MAX_ENROLL_STAGES 3 -#undef WID -#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) - static DBusGProxy *manager = NULL; static DBusGConnection *connection = NULL; static gboolean is_disable = FALSE; diff --git a/capplets/about-me/gnome-about-me-password.c b/capplets/about-me/gnome-about-me-password.c index aa405accf..6a10d99f9 100644 --- a/capplets/about-me/gnome-about-me-password.c +++ b/capplets/about-me/gnome-about-me-password.c @@ -44,9 +44,6 @@ #include "capplet-util.h" #include "eel-alert-dialog.h" -#undef WID -#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) - /* Passwd states */ typedef enum { PASSWD_STATE_NONE, /* Passwd is not asking for anything */ diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c index 3f35c9c57..8119c3c25 100644 --- a/capplets/about-me/gnome-about-me.c +++ b/capplets/about-me/gnome-about-me.c @@ -51,9 +51,6 @@ #define EMAIL_SLOTS 4 -#undef WID -#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) - typedef struct { EContact *contact; EBook *book; diff --git a/capplets/common/capplet-util.h b/capplets/common/capplet-util.h index a15055807..572656535 100644 --- a/capplets/common/capplet-util.h +++ b/capplets/common/capplet-util.h @@ -32,9 +32,9 @@ /* Macros to make certain repetitive tasks a bit easier */ -/* Retrieve a widget from the Glade object */ +/* Retrieve a widget from the UI object */ -#define WID(s) glade_xml_get_widget (dialog, s) +#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) /* Some miscellaneous functions useful to all capplets */ diff --git a/capplets/keyboard/gnome-keyboard-properties-a11y.c b/capplets/keyboard/gnome-keyboard-properties-a11y.c index 216e18b47..4a86c1182 100644 --- a/capplets/keyboard/gnome-keyboard-properties-a11y.c +++ b/capplets/keyboard/gnome-keyboard-properties-a11y.c @@ -30,8 +30,6 @@ #include "capplet-util.h" #define CONFIG_ROOT "/desktop/gnome/accessibility/keyboard" -#undef WID -#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) #define NWID(s) GTK_WIDGET (gtk_builder_get_object (notifications_dialog, s)) static GtkBuilder *notifications_dialog = NULL; diff --git a/capplets/keyboard/gnome-keyboard-properties-xkb.c b/capplets/keyboard/gnome-keyboard-properties-xkb.c index 01387b1f6..f7a7515ad 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkb.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkb.c @@ -37,9 +37,6 @@ #include -#undef WID -#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) - XklEngine *engine; XklConfigRegistry *config_registry; diff --git a/capplets/keyboard/gnome-keyboard-properties-xkblt.c b/capplets/keyboard/gnome-keyboard-properties-xkblt.c index 4da5aaf75..680f0ad83 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkblt.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkblt.c @@ -39,9 +39,6 @@ #define SEL_LAYOUT_TREE_COL_DEFAULT 1 #define SEL_LAYOUT_TREE_COL_ID 2 -#undef WID -#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) - static int idx2select = -1; static int max_selected_layouts = -1; static int default_group = -1; diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c b/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c index 6cfe5f7df..c8bacea20 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c @@ -33,9 +33,6 @@ #include "capplet-util.h" #include "gnome-keyboard-properties-xkb.h" -#undef WID -#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) - #define GROUP_SWITCHERS_GROUP "grp" #define DEFAULT_GROUP_SWITCH "grp:alts_toggle" #define DEFAULT_VARIANT_ID "__default__" diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbmc.c b/capplets/keyboard/gnome-keyboard-properties-xkbmc.c index 094978a26..4b55e064d 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbmc.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbmc.c @@ -33,9 +33,6 @@ #include "gnome-keyboard-properties-xkb.h" -#undef WID -#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) - static gchar *current_model_name = NULL; static gchar *current_vendor_name = NULL; diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbot.c b/capplets/keyboard/gnome-keyboard-properties-xkbot.c index d0d3e58f5..d907f29eb 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbot.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbot.c @@ -34,9 +34,6 @@ #include "gnome-keyboard-properties-xkb.h" -#undef WID -#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) - static GtkBuilder *chooser_dialog = NULL; static const char *current1st_level_id = NULL; static GSList *option_checks_list = NULL; diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c index 3aadf2eef..d2aef71fe 100644 --- a/capplets/keyboard/gnome-keyboard-properties.c +++ b/capplets/keyboard/gnome-keyboard-properties.c @@ -38,9 +38,6 @@ #include "gnome-keyboard-properties-a11y.h" #include "gnome-keyboard-properties-xkb.h" -#undef WID -#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) - enum { RESPONSE_APPLY = 1, RESPONSE_CLOSE diff --git a/capplets/mouse/gnome-mouse-accessibility.c b/capplets/mouse/gnome-mouse-accessibility.c index 09115e550..3fedfd4da 100644 --- a/capplets/mouse/gnome-mouse-accessibility.c +++ b/capplets/mouse/gnome-mouse-accessibility.c @@ -26,9 +26,6 @@ /* 5th entry in combo box */ #define DIRECTION_DISABLE 4 -#undef WID -#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) - enum { CLICK_TYPE_SINGLE, CLICK_TYPE_DOUBLE, diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c index f1e8d4e90..8fd4a70c6 100644 --- a/capplets/mouse/gnome-mouse-properties.c +++ b/capplets/mouse/gnome-mouse-properties.c @@ -49,9 +49,6 @@ #include #endif -#undef WID -#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) - enum { DOUBLE_CLICK_TEST_OFF, diff --git a/configure.in b/configure.in index e5e00a56d..e02955f90 100644 --- a/configure.in +++ b/configure.in @@ -91,7 +91,7 @@ COMMON_MODULES="gtk+-2.0 >= 2.15.0 dnl glib-2.0 >= 2.17.4 dnl gio-2.0 dnl gconf-2.0 dnl - libglade-2.0 >= 2.0.0 dnl + libxml-2.0 dnl gnome-desktop-2.0 >= 2.25.1" PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1) @@ -284,7 +284,7 @@ GNOMECC_CAPPLETS_CFLAGS="${COMMON_CFLAGS} ${CAPPLET_CFLAGS} ${EXTRA_CFLAGS} ${DB GNOMECC_CAPPLETS_LIBS="${COMMON_LIBS} ${CAPPLET_LIBS} ${DBUS_LIBS}" GNOMECC_CAPPLETS_CLEANFILES="\$(desktop) \$(desktop).in" -GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(desktop).in.in \$(cappletname)-capplet.png \$(cappletname)-properties.glade \$(pixmaps_DATA)" +GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(desktop).in.in \$(cappletname)-capplet.png \$(pixmaps_DATA)" AC_SUBST(GNOMECC_CAPPLETS_EXTRA_DIST) AC_SUBST(GNOMECC_CAPPLETS_CLEANFILES) diff --git a/po/POTFILES.in b/po/POTFILES.in index a536a26af..4dcb7b380 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,12 +5,12 @@ capplets/about-me/eel-alert-dialog.c capplets/about-me/e-image-chooser.c capplets/about-me/fingerprint-strings.h capplets/about-me/gnome-about-me.c -capplets/about-me/gnome-about-me-dialog.ui +[type: gettext/glade]capplets/about-me/gnome-about-me-dialog.ui capplets/about-me/gnome-about-me.desktop.in.in capplets/about-me/gnome-about-me-fingerprint.c -capplets/about-me/gnome-about-me-fingerprint.ui +[type: gettext/glade]capplets/about-me/gnome-about-me-fingerprint.ui capplets/about-me/gnome-about-me-password.c -capplets/about-me/gnome-about-me-password.ui +[type: gettext/glade]capplets/about-me/gnome-about-me-password.ui [type: gettext/glade]capplets/accessibility/at-properties/at-enable-dialog.ui capplets/accessibility/at-properties/at-properties.desktop.in.in capplets/accessibility/at-properties/main.c @@ -49,11 +49,11 @@ capplets/keybindings/gnome-keybinding-properties.c [type: gettext/glade]capplets/keybindings/gnome-keybinding-properties.ui capplets/keybindings/keybinding.desktop.in.in capplets/keyboard/gnome-keyboard-properties.c -capplets/keyboard/gnome-keyboard-properties-a11y-notifications.ui -capplets/keyboard/gnome-keyboard-properties-dialog.ui -capplets/keyboard/gnome-keyboard-properties-layout-chooser.ui -capplets/keyboard/gnome-keyboard-properties-model-chooser.ui -capplets/keyboard/gnome-keyboard-properties-options-dialog.ui +[type: gettext/glade]capplets/keyboard/gnome-keyboard-properties-a11y-notifications.ui +[type: gettext/glade]capplets/keyboard/gnome-keyboard-properties-dialog.ui +[type: gettext/glade]capplets/keyboard/gnome-keyboard-properties-layout-chooser.ui +[type: gettext/glade]capplets/keyboard/gnome-keyboard-properties-model-chooser.ui +[type: gettext/glade]capplets/keyboard/gnome-keyboard-properties-options-dialog.ui capplets/keyboard/gnome-keyboard-properties-xkb.c capplets/keyboard/gnome-keyboard-properties-xkbltadd.c capplets/keyboard/gnome-keyboard-properties-xkblt.c @@ -63,7 +63,7 @@ capplets/keyboard/gnome-keyboard-properties-xkbpv.c capplets/keyboard/keyboard.desktop.in.in capplets/mouse/gnome-mouse-accessibility.c capplets/mouse/gnome-mouse-properties.c -capplets/mouse/gnome-mouse-properties.ui +[type: gettext/glade]capplets/mouse/gnome-mouse-properties.ui capplets/mouse/gnome-settings-mouse.desktop.in.in capplets/network/gnome-network-properties.c capplets/network/gnome-network-properties.desktop.in.in