[maemo-commits] [maemo-commits] r9443 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Jan 29 18:40:55 EET 2007
- Previous message: [maemo-commits] r9442 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r9444 - projects/haf/branches/maemo-af-desktop/python-hildondesktop
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: mitch Date: 2007-01-29 18:40:51 +0200 (Mon, 29 Jan 2007) New Revision: 9443 Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkaccellabel.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtklabel.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtksettings.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwindow.c Log: 2007-01-29 Michael Natterer <mitch at imendio.com> * gtk/gtkaccellabel.c * gtk/gtklabel.c * gtk/gtkmenushell.c * gtk/gtksettings.c * gtk/gtkwindow.c: revert hildon-keyboard-shortcuts patch, it will be replaced by the upstream version (see gnome bug #72375). Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog 2007-01-29 15:59:21 UTC (rev 9442) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog 2007-01-29 16:40:51 UTC (rev 9443) @@ -1,5 +1,14 @@ 2007-01-29 Michael Natterer <mitch at imendio.com> + * gtk/gtkaccellabel.c + * gtk/gtklabel.c + * gtk/gtkmenushell.c + * gtk/gtksettings.c + * gtk/gtkwindow.c: revert hildon-keyboard-shortcuts patch, it will + be replaced by the upstream version (see gnome bug #72375). + +2007-01-29 Michael Natterer <mitch at imendio.com> + Removed MAEMO_CHANGES stuff from this change, because it has been merged to upstream: Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkaccellabel.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkaccellabel.c 2007-01-29 15:59:21 UTC (rev 9442) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkaccellabel.c 2007-01-29 16:40:51 UTC (rev 9443) @@ -661,10 +661,6 @@ gboolean gtk_accel_label_refetch (GtkAccelLabel *accel_label) { -#ifdef MAEMO_CHANGES - gboolean keyboard_shortcuts; -#endif /* MAEMO_CHANGES */ - g_return_val_if_fail (GTK_IS_ACCEL_LABEL (accel_label), FALSE); if (accel_label->accel_string) @@ -673,15 +669,7 @@ accel_label->accel_string = NULL; } -#ifdef MAEMO_CHANGES - g_object_get (gtk_widget_get_settings (GTK_WIDGET (accel_label)), - "hildon-keyboard-shortcuts", &keyboard_shortcuts, - NULL); - - if (keyboard_shortcuts && accel_label->accel_closure) -#else if (accel_label->accel_closure) -#endif /* MAEMO_CHANGES */ { GtkAccelKey *key = gtk_accel_group_find (accel_label->accel_group, find_accel, accel_label->accel_closure); Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtklabel.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtklabel.c 2007-01-29 15:59:21 UTC (rev 9442) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtklabel.c 2007-01-29 16:40:51 UTC (rev 9443) @@ -27,9 +27,6 @@ #include <math.h> #include <string.h> #include "gtklabel.h" -#ifdef MAEMO_CHANGES -#include "gtkaccellabel.h" -#endif /* MAEMO_CHANGES */ #include "gtkdnd.h" #include "gtkmain.h" #include "gtkmarshalers.h" @@ -968,78 +965,11 @@ gtk_label_setup_mnemonic (label, label->mnemonic_keyval); } -#ifdef MAEMO_CHANGES - static void -keyboard_shortcuts_change_notify (GtkLabel *label) -{ - gtk_label_recalculate (label); - if (GTK_IS_ACCEL_LABEL (label)) - gtk_accel_label_refetch (GTK_ACCEL_LABEL (label)); -} - -static void -traverse_container (GtkWidget *widget, - gpointer data) -{ - if (GTK_IS_LABEL (widget)) - keyboard_shortcuts_change_notify (GTK_LABEL (widget)); - else if (GTK_IS_CONTAINER (widget)) - gtk_container_forall (GTK_CONTAINER (widget), traverse_container, data); -} - -static void -hildon_label_setting_changed (GtkSettings *settings) -{ - GList *list, *l; - - list = gtk_window_list_toplevels (); - - for (l = list; l ; l = l->next) - { - GtkWidget *widget = l->data; - - if (gtk_widget_get_settings (widget) == settings) - gtk_container_forall (GTK_CONTAINER (widget), - traverse_container, NULL); - } - - g_list_free (list); -} - -#endif /* MAEMO_CHANGES */ - -static void gtk_label_screen_changed (GtkWidget *widget, GdkScreen *old_screen) { -#ifdef MAEMO_CHANGES - GtkSettings *settings; - gboolean keyboard_shortcuts_connected; - - if (!gtk_widget_has_screen (widget)) - return; - - settings = gtk_widget_get_settings (widget); - - keyboard_shortcuts_connected = - GPOINTER_TO_INT (g_object_get_data (G_OBJECT (settings), - "hildon-label-connected")); - - if (! keyboard_shortcuts_connected) - { - g_signal_connect (settings, "notify::hildon-keyboard-shortcuts", - G_CALLBACK (hildon_label_setting_changed), - NULL); - - g_object_set_data (G_OBJECT (settings), "hildon-label-connected", - GINT_TO_POINTER (TRUE)); - } - - keyboard_shortcuts_change_notify (GTK_LABEL (widget)); -#else gtk_label_clear_layout (GTK_LABEL (widget)); -#endif /* MAEMO_CHANGES */ } static void @@ -1528,21 +1458,9 @@ const gchar *pattern) { PangoAttrList *attrs; -#ifdef MAEMO_CHANGES - gboolean keyboard_shortcuts; -#endif /* MAEMO_CHANGES */ - g_return_if_fail (GTK_IS_LABEL (label)); - -#ifdef MAEMO_CHANGES - g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)), - "hildon-keyboard-shortcuts", &keyboard_shortcuts, - NULL); - if (keyboard_shortcuts && pattern) -#else if (pattern) -#endif /* MAEMO_CHANGES */ attrs = gtk_label_pattern_to_attrs (label, pattern); else attrs = NULL; Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.c 2007-01-29 15:59:21 UTC (rev 9442) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.c 2007-01-29 16:40:51 UTC (rev 9443) @@ -701,10 +701,7 @@ GdkEventKey *event) { GtkMenuShell *menu_shell; -#ifdef MAEMO_CHANGES - gboolean keyboard_shortcuts; -#endif /* MAEMO_CHANGES */ - + g_return_val_if_fail (GTK_IS_MENU_SHELL (widget), FALSE); g_return_val_if_fail (event != NULL, FALSE); @@ -716,14 +713,6 @@ if (gtk_bindings_activate_event (GTK_OBJECT (widget), event)) return TRUE; -#ifdef MAEMO_CHANGES - g_object_get (gtk_widget_get_settings (widget), - "hildon-keyboard-shortcuts", &keyboard_shortcuts, - NULL); - if (!keyboard_shortcuts) - return FALSE; -#endif /* MAEMO_CHANGES */ - return gtk_menu_shell_activate_mnemonic (menu_shell, event); } Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtksettings.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtksettings.c 2007-01-29 15:59:21 UTC (rev 9442) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtksettings.c 2007-01-29 16:40:51 UTC (rev 9443) @@ -95,10 +95,7 @@ PROP_KEYNAV_CURSOR_ONLY, PROP_KEYNAV_WRAP_AROUND, PROP_ERROR_BELL, - PROP_COLOR_HASH, -#ifdef MAEMO_CHANGES - PROP_KEYBOARD_SHORTCUTS -#endif /* MAEMO_CHANGES */ + PROP_COLOR_HASH }; @@ -574,17 +571,6 @@ GTK_PARAM_READABLE)); class_n_properties++; - -#ifdef MAEMO_CHANGES - result = settings_install_property_parser (class, - g_param_spec_boolean ("hildon-keyboard-shortcuts", - P_("Visual keyboard shortcut cues"), - P_("Whether menus should have visible accelerators and mnemonics"), - TRUE, - GTK_PARAM_READWRITE), - NULL); - g_assert (result == PROP_KEYBOARD_SHORTCUTS); -#endif /* MAEMO_CHANGES */ } static void Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwindow.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwindow.c 2007-01-29 15:59:21 UTC (rev 9442) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwindow.c 2007-01-29 16:40:51 UTC (rev 9443) @@ -4691,18 +4691,9 @@ { GtkWindow *window = GTK_WINDOW (widget); gboolean handled = FALSE; -#ifdef MAEMO_CHANGES - gboolean keyboard_shortcuts; - g_object_get (gtk_widget_get_settings (widget), - "hildon-keyboard-shortcuts", &keyboard_shortcuts, - NULL); - /* handle mnemonics and accelerators */ - if (keyboard_shortcuts && !handled) -#else if (!handled) -#endif /* MAEMO_CHANGES */ handled = gtk_window_activate_key (window, event); /* handle focus widget key events */
- Previous message: [maemo-commits] r9442 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r9444 - projects/haf/branches/maemo-af-desktop/python-hildondesktop
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]