diff -Nru --exclude configure --exclude help --exclude po gnome-panel-2.22.1.3/applets/ChangeLog gnome-panel-2.22.2/applets/ChangeLog --- gnome-panel-2.22.1.3/applets/ChangeLog 2008-04-15 22:58:02.000000000 +0200 +++ gnome-panel-2.22.2/applets/ChangeLog 2008-05-26 18:10:54.000000000 +0200 @@ -1,3 +1,5 @@ +==================== 2.22.1.3 ==================== + ==================== 2.22.1.2 ==================== ==================== 2.22.1.1 ==================== diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/applets/clock/calendar-window.c /tmp/vKVLDG768l/gnome-panel-2.22.2/applets/clock/calendar-window.c --- gnome-panel-2.22.1.3/applets/clock/calendar-window.c 2008-04-15 22:58:01.000000000 +0200 +++ gnome-panel-2.22.2/applets/clock/calendar-window.c 2008-05-26 18:10:53.000000000 +0200 @@ -385,9 +385,10 @@ gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_URI, &uri, -1); if (uri) - return (strcmp (uri, "file") == 0 || - strcmp (uri, "webcal") == 0 || - strcmp (uri, "caldav") == 0); + return (g_ascii_strcasecmp (uri, "file") == 0 || + g_ascii_strcasecmp (uri, "webcal") == 0 || + g_ascii_strcasecmp (uri, "caldav") == 0 || + g_ascii_strcasecmp (uri, "google") == 0); return FALSE; } @@ -400,7 +401,7 @@ gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_URI, &uri, -1); if (uri) - return (strcmp (uri, "contacts") == 0); + return (g_ascii_strcasecmp (uri, "contacts") == 0); return FALSE; } @@ -413,7 +414,7 @@ gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_URI, &uri, -1); if (uri) - return (strcmp (uri, "weather") == 0); + return (g_ascii_strcasecmp (uri, "weather") == 0); return FALSE; } diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/applets/clock/ChangeLog /tmp/vKVLDG768l/gnome-panel-2.22.2/applets/clock/ChangeLog --- gnome-panel-2.22.1.3/applets/clock/ChangeLog 2008-04-15 22:58:01.000000000 +0200 +++ gnome-panel-2.22.2/applets/clock/ChangeLog 2008-05-26 18:40:34.000000000 +0200 @@ -1,3 +1,44 @@ +2008-05-26 Vincent Untz + + * Makefile.am: + * gnome-clock-applet-mechanism.policy.in: rename to... + * org.gnome.clockapplet.mechanism.policy.in: this, and add , + , + +2008-05-13 Vincent Untz + + * clock.c: (run_prefs_locations_add), (edit_tree_row): put the focus in + the name entry + +2008-05-07 Vincent Untz + + * calendar-window.c: (is_appointment): accept google uri too, for + google calendars and use g_ascii_strcasecmp(). Should help with bug + #525691 + (is_birthday), (is_weather): use g_ascii_strcasecmp() + +2008-04-23 Matthias Clasen + + * system-timezone.c (system_timezone_is_zone_file_valid): Don't + assume that g_io_channel_read_chars returns a NUL-terminated + string - it doesn't. + +2008-04-17 Vincent Untz + + * clock.glade: revert last commit on this branch, since we're string + frozen. + +2008-04-16 Matthias Clasen + + * clock.glade: Change the mnemonics for the clock format radios + to avoid a conflict with the help button. + +2008-04-16 Matthias Clasen + + * clock.c: Make the help button on the preference dialog work. + +==================== 2.22.1.3 ==================== + 2008-04-11 Vincent Untz * system-timezone.c: (system_timezone_write_key_file), diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/applets/clock/clock.c /tmp/vKVLDG768l/gnome-panel-2.22.2/applets/clock/clock.c --- gnome-panel-2.22.1.3/applets/clock/clock.c 2008-04-15 22:58:01.000000000 +0200 +++ gnome-panel-2.22.2/applets/clock/clock.c 2008-05-26 18:10:53.000000000 +0200 @@ -2954,21 +2954,6 @@ } static void -properties_response_cb (GtkWidget *widget, - int id, - ClockData *cd) -{ - /* FMQ: was used from old preferences dialog; fix this up */ - - if (id == GTK_RESPONSE_HELP) - clock_utils_display_help (cd->applet, - "clock", "clock", "clock-settings"); - - else - gtk_widget_destroy (widget); -} - -static void prefs_locations_changed (GtkTreeSelection *selection, ClockData *cd) { gint n; @@ -3693,6 +3678,13 @@ return TRUE; } +static void +prefs_help (GtkWidget *widget, ClockData *cd) +{ + clock_utils_display_help (cd->applet, + "clock", "clock", "clock-settings"); +} + typedef struct { const gchar *name; const gchar *country_code; @@ -3873,6 +3865,7 @@ run_prefs_locations_add (GtkButton *button, ClockData *cd) { GtkWidget *edit_window = glade_xml_get_widget (cd->glade_xml, "edit-location-window"); + GtkWidget *name_entry = glade_xml_get_widget (cd->glade_xml, "edit-location-name-entry"); GtkWidget *zone_combo = glade_xml_get_widget (cd->glade_xml, "edit-location-timezone-combo"); fill_timezone_combo_from_location (cd, zone_combo, NULL); @@ -3887,6 +3880,9 @@ GINT_TO_POINTER (g_signal_connect (edit_window, "delete_event", G_CALLBACK (edit_delete), cd))); } + gtk_widget_grab_focus (name_entry); + gtk_editable_set_position (GTK_EDITABLE (name_entry), -1); + gtk_window_present_with_time (GTK_WINDOW (edit_window), gtk_get_current_event_time ()); } @@ -3951,6 +3947,9 @@ g_object_set_data (G_OBJECT (edit_window), "clock-location", loc); + gtk_widget_grab_focus (name_entry); + gtk_editable_set_position (GTK_EDITABLE (name_entry), -1); + gtk_window_present (GTK_WINDOW (edit_window)); } @@ -4147,6 +4146,7 @@ { GtkWidget *edit_window; GtkWidget *prefs_close_button; + GtkWidget *prefs_help_button; GtkWidget *edit_cancel_button; GtkWidget *edit_ok_button; GtkWidget *zone_combo; @@ -4163,6 +4163,7 @@ gtk_window_set_icon_name (GTK_WINDOW (cd->prefs_window), CLOCK_ICON); prefs_close_button = glade_xml_get_widget (cd->glade_xml, "prefs-close-button"); + prefs_help_button = glade_xml_get_widget (cd->glade_xml, "prefs-help-button"); cd->prefs_locations = GTK_TREE_VIEW (glade_xml_get_widget (cd->glade_xml, "cities_list")); selection = gtk_tree_view_get_selection (cd->prefs_locations); @@ -4175,6 +4176,9 @@ g_signal_connect (G_OBJECT (prefs_close_button), "clicked", G_CALLBACK (prefs_hide), cd); + g_signal_connect (G_OBJECT (prefs_help_button), "clicked", + G_CALLBACK (prefs_help), cd); + cd->prefs_location_remove_button = glade_xml_get_widget (cd->glade_xml, "prefs-locations-remove-button"); g_signal_connect (G_OBJECT (cd->prefs_location_remove_button), "clicked", diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/applets/clock/gnome-clock-applet-mechanism-glue.h /tmp/vKVLDG768l/gnome-panel-2.22.2/applets/clock/gnome-clock-applet-mechanism-glue.h --- gnome-panel-2.22.1.3/applets/clock/gnome-clock-applet-mechanism-glue.h 2008-04-15 23:06:13.000000000 +0200 +++ gnome-panel-2.22.2/applets/clock/gnome-clock-applet-mechanism-glue.h 2008-05-26 18:31:46.000000000 +0200 @@ -53,7 +53,7 @@ #endif /* !G_ENABLE_DEBUG */ -/* NONE:BOOLEAN,POINTER (/tmp/dbus-binding-tool-c-marshallers.PU0Z9T:1) */ +/* NONE:BOOLEAN,POINTER (/tmp/dbus-binding-tool-c-marshallers.0P6UBU:1) */ extern void dbus_glib_marshal_gnome_clock_applet_mechanism_VOID__BOOLEAN_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -97,7 +97,7 @@ } #define dbus_glib_marshal_gnome_clock_applet_mechanism_NONE__BOOLEAN_POINTER dbus_glib_marshal_gnome_clock_applet_mechanism_VOID__BOOLEAN_POINTER -/* NONE:INT64,POINTER (/tmp/dbus-binding-tool-c-marshallers.PU0Z9T:2) */ +/* NONE:INT64,POINTER (/tmp/dbus-binding-tool-c-marshallers.0P6UBU:2) */ extern void dbus_glib_marshal_gnome_clock_applet_mechanism_VOID__INT64_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -141,7 +141,7 @@ } #define dbus_glib_marshal_gnome_clock_applet_mechanism_NONE__INT64_POINTER dbus_glib_marshal_gnome_clock_applet_mechanism_VOID__INT64_POINTER -/* NONE:STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.PU0Z9T:3) */ +/* NONE:STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.0P6UBU:3) */ extern void dbus_glib_marshal_gnome_clock_applet_mechanism_VOID__STRING_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -185,7 +185,7 @@ } #define dbus_glib_marshal_gnome_clock_applet_mechanism_NONE__STRING_POINTER dbus_glib_marshal_gnome_clock_applet_mechanism_VOID__STRING_POINTER -/* NONE:POINTER (/tmp/dbus-binding-tool-c-marshallers.PU0Z9T:4) */ +/* NONE:POINTER (/tmp/dbus-binding-tool-c-marshallers.0P6UBU:4) */ #define dbus_glib_marshal_gnome_clock_applet_mechanism_VOID__POINTER g_cclosure_marshal_VOID__POINTER #define dbus_glib_marshal_gnome_clock_applet_mechanism_NONE__POINTER dbus_glib_marshal_gnome_clock_applet_mechanism_VOID__POINTER diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/applets/clock/gnome-clock-applet-mechanism.policy.in /tmp/vKVLDG768l/gnome-panel-2.22.2/applets/clock/gnome-clock-applet-mechanism.policy.in --- gnome-panel-2.22.1.3/applets/clock/gnome-clock-applet-mechanism.policy.in 2008-04-15 22:58:01.000000000 +0200 +++ gnome-panel-2.22.2/applets/clock/gnome-clock-applet-mechanism.policy.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ - - - - - - - <_description>Change system time zone - <_message>Privileges are required to change the system time zone. - - no - auth_self_keep_always - - - - - <_description>Change system time - <_message>Privileges are required to change the system time. - - no - auth_self_keep_always - - - - - <_description>Configure hardware clock - <_message>Privileges are required to configure the hardware clock. - - no - auth_self_keep_always - - - - diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/applets/clock/Makefile.am /tmp/vKVLDG768l/gnome-panel-2.22.2/applets/clock/Makefile.am --- gnome-panel-2.22.1.3/applets/clock/Makefile.am 2008-04-15 22:58:01.000000000 +0200 +++ gnome-panel-2.22.2/applets/clock/Makefile.am 2008-05-26 18:39:05.000000000 +0200 @@ -212,7 +212,7 @@ polkitdir = $(datadir)/PolicyKit/policy dbus_services_in_files = org.gnome.ClockApplet.Mechanism.service.in -polkit_in_files = gnome-clock-applet-mechanism.policy.in +polkit_in_files = org.gnome.clockapplet.mechanism.policy.in if HAVE_POLKIT dbus_services_DATA = $(dbus_services_in_files:.service.in=.service) diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/applets/clock/Makefile.in /tmp/vKVLDG768l/gnome-panel-2.22.2/applets/clock/Makefile.in --- gnome-panel-2.22.1.3/applets/clock/Makefile.in 2008-04-15 23:04:55.000000000 +0200 +++ gnome-panel-2.22.2/applets/clock/Makefile.in 2008-05-26 18:47:01.000000000 +0200 @@ -527,7 +527,7 @@ dbus_confdir = $(sysconfdir)/dbus-1/system.d polkitdir = $(datadir)/PolicyKit/policy dbus_services_in_files = org.gnome.ClockApplet.Mechanism.service.in -polkit_in_files = gnome-clock-applet-mechanism.policy.in +polkit_in_files = org.gnome.clockapplet.mechanism.policy.in @HAVE_POLKIT_FALSE@dbus_services_DATA = @HAVE_POLKIT_TRUE@dbus_services_DATA = $(dbus_services_in_files:.service.in=.service) @HAVE_POLKIT_FALSE@dbus_conf_DATA = diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/applets/clock/org.gnome.clockapplet.mechanism.policy.in /tmp/vKVLDG768l/gnome-panel-2.22.2/applets/clock/org.gnome.clockapplet.mechanism.policy.in --- gnome-panel-2.22.1.3/applets/clock/org.gnome.clockapplet.mechanism.policy.in 1970-01-01 01:00:00.000000000 +0100 +++ gnome-panel-2.22.2/applets/clock/org.gnome.clockapplet.mechanism.policy.in 2008-05-26 18:39:29.000000000 +0200 @@ -0,0 +1,38 @@ + + + + + The GNOME Project + http://www.gnome.org/ + gnome-panel-clock + + + <_description>Change system time zone + <_message>Privileges are required to change the system time zone. + + no + auth_self_keep_always + + + + + <_description>Change system time + <_message>Privileges are required to change the system time. + + no + auth_self_keep_always + + + + + <_description>Configure hardware clock + <_message>Privileges are required to configure the hardware clock. + + no + auth_self_keep_always + + + + diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/applets/clock/system-timezone.c /tmp/vKVLDG768l/gnome-panel-2.22.2/applets/clock/system-timezone.c --- gnome-panel-2.22.1.3/applets/clock/system-timezone.c 2008-04-15 22:58:01.000000000 +0200 +++ gnome-panel-2.22.2/applets/clock/system-timezone.c 2008-05-26 18:10:53.000000000 +0200 @@ -910,7 +910,7 @@ return FALSE; } - if (read != 4 || strcmp (buffer, TZ_MAGIC) != 0) { + if (read != strlen (TZ_MAGIC) || strncmp (buffer, TZ_MAGIC, strlen (TZ_MAGIC)) != 0) { g_set_error (error, SYSTEM_TIMEZONE_ERROR, SYSTEM_TIMEZONE_ERROR_INVALID_TIMEZONE_FILE, "%s is not a timezone file", diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/applets/fish/ChangeLog /tmp/vKVLDG768l/gnome-panel-2.22.2/applets/fish/ChangeLog --- gnome-panel-2.22.1.3/applets/fish/ChangeLog 2008-04-15 22:57:57.000000000 +0200 +++ gnome-panel-2.22.2/applets/fish/ChangeLog 2008-05-26 18:10:46.000000000 +0200 @@ -1,3 +1,5 @@ +==================== 2.22.1.3 ==================== + ==================== 2.22.1.2 ==================== ==================== 2.22.1.1 ==================== diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/applets/notification_area/ChangeLog /tmp/vKVLDG768l/gnome-panel-2.22.2/applets/notification_area/ChangeLog --- gnome-panel-2.22.1.3/applets/notification_area/ChangeLog 2008-04-15 22:58:02.000000000 +0200 +++ gnome-panel-2.22.2/applets/notification_area/ChangeLog 2008-05-26 18:10:54.000000000 +0200 @@ -1,3 +1,5 @@ +==================== 2.22.1.3 ==================== + ==================== 2.22.1.2 ==================== ==================== 2.22.1.1 ==================== diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/applets/wncklet/ChangeLog /tmp/vKVLDG768l/gnome-panel-2.22.2/applets/wncklet/ChangeLog --- gnome-panel-2.22.1.3/applets/wncklet/ChangeLog 2008-04-15 22:57:57.000000000 +0200 +++ gnome-panel-2.22.2/applets/wncklet/ChangeLog 2008-05-26 18:10:45.000000000 +0200 @@ -1,3 +1,5 @@ +==================== 2.22.1.3 ==================== + ==================== 2.22.1.2 ==================== ==================== 2.22.1.1 ==================== diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/ChangeLog /tmp/vKVLDG768l/gnome-panel-2.22.2/ChangeLog --- gnome-panel-2.22.1.3/ChangeLog 2008-04-15 22:59:05.000000000 +0200 +++ gnome-panel-2.22.2/ChangeLog 2008-05-26 18:26:57.000000000 +0200 @@ -1,3 +1,15 @@ +2008-05-26 Vincent Untz + + * NEWS: + * README: + * configure.in: version 2.22.2 + +2008-04-15 Vincent Untz + + * configure.in: post-release bump to 2.22.2. + +==================== 2.22.1.3 ==================== + 2008-04-15 Vincent Untz * NEWS: diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/configure.in /tmp/vKVLDG768l/gnome-panel-2.22.2/configure.in --- gnome-panel-2.22.1.3/configure.in 2008-04-15 22:59:12.000000000 +0200 +++ gnome-panel-2.22.2/configure.in 2008-05-26 18:27:02.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([gnome-panel], [2.22.1.3], +AC_INIT([gnome-panel], [2.22.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel]) AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) @@ -14,7 +14,7 @@ # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -LIB_PANEL_APPLET_LT_VERSION=2:33:2 +LIB_PANEL_APPLET_LT_VERSION=2:34:2 AC_SUBST(LIB_PANEL_APPLET_LT_VERSION) AM_MAINTAINER_MODE diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/debian/changelog /tmp/vKVLDG768l/gnome-panel-2.22.2/debian/changelog --- gnome-panel-2.22.1.3/debian/changelog 2008-05-26 23:38:04.000000000 +0200 +++ gnome-panel-2.22.2/debian/changelog 2008-05-26 23:38:05.000000000 +0200 @@ -1,3 +1,23 @@ +gnome-panel (1:2.22.2-0ubuntu1) hardy-proposed; urgency=low + + * New upstream version: + Panel + - When opening a recent file, do not only look for applications that + can open URI; if the file is gio-native (file://), then it's fine to + get applications that can open paths + - Open a mount after having mounted it since nautilus won't automatically + open it anymore + - Fix dragging of launchers from the Add to panel dialog (lp: #192316) + Clock Applet + - Make the help button on the preference dialog work + - Fix timezone file handling to correctly recognize timezone magic header + - Accept Google URI for Google calendars appointments + - Put the initial focus in the name entry for the Edit location dialog + - Rename the clock applet PolicyKit .policy file so that it validates + and add some more information there + + -- Sebastien Bacher Mon, 26 May 2008 23:20:19 +0200 + gnome-panel (1:2.22.1.3-0ubuntu1) hardy-proposed; urgency=low * New upstream version (lp: #226831): diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/doc/reference/panel-applet/ChangeLog /tmp/vKVLDG768l/gnome-panel-2.22.2/doc/reference/panel-applet/ChangeLog --- gnome-panel-2.22.1.3/doc/reference/panel-applet/ChangeLog 2008-04-15 22:57:56.000000000 +0200 +++ gnome-panel-2.22.2/doc/reference/panel-applet/ChangeLog 2008-05-26 18:10:44.000000000 +0200 @@ -1,3 +1,5 @@ +==================== 2.22.1.3 ==================== + ==================== 2.22.1.2 ==================== ==================== 2.22.1.1 ==================== diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/gnome-panel/ChangeLog /tmp/vKVLDG768l/gnome-panel-2.22.2/gnome-panel/ChangeLog --- gnome-panel-2.22.1.3/gnome-panel/ChangeLog 2008-04-15 22:57:56.000000000 +0200 +++ gnome-panel-2.22.2/gnome-panel/ChangeLog 2008-05-26 18:10:44.000000000 +0200 @@ -1,3 +1,24 @@ +2008-05-20 Vincent Untz + + * panel-addto.c: (panel_addto_setup_launcher_drag): use an URI and not + a path when setting the drag source for text/uri-list. Fix bug #532171. + +2008-05-16 Vincent Untz + + * panel-menu-items.c: (activate_uri_on_screen): new, based on + activate_uri + (activate_uri): just call activate_uri_on_screen + (volume_mount_cb): open the mount after having mounted it + Fix bug #528423 + +2008-05-07 Vincent Untz + + * panel-recent.c: (show_uri): do not only look for applications that + can open URI; if the file is gio-native (file://), then it's fine to + get applications that can open paths. + +==================== 2.22.1.3 ==================== + ==================== 2.22.1.2 ==================== ==================== 2.22.1.1 ==================== diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/gnome-panel/panel-addto.c /tmp/vKVLDG768l/gnome-panel-2.22.2/gnome-panel/panel-addto.c --- gnome-panel-2.22.1.3/gnome-panel/panel-addto.c 2008-04-15 22:57:56.000000000 +0200 +++ gnome-panel-2.22.2/gnome-panel/panel-addto.c 2008-05-26 18:10:44.000000000 +0200 @@ -350,16 +350,19 @@ static void panel_addto_setup_launcher_drag (GtkTreeView *tree_view, - const char *uri) + const char *path) { static GtkTargetEntry target[] = { { "text/uri-list", 0, 0 } }; + char *uri; char *uri_list; + uri = g_filename_to_uri (path, NULL, NULL); uri_list = g_strconcat (uri, "\r\n", NULL); panel_addto_setup_drag (tree_view, target, uri_list); g_free (uri_list); + g_free (uri); } static void diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/gnome-panel/panel-menu-items.c /tmp/vKVLDG768l/gnome-panel-2.22.2/gnome-panel/panel-menu-items.c --- gnome-panel-2.22.1.3/gnome-panel/panel-menu-items.c 2008-04-15 22:57:56.000000000 +0200 +++ gnome-panel-2.22.2/gnome-panel/panel-menu-items.c 2008-05-26 18:10:44.000000000 +0200 @@ -97,18 +97,15 @@ }; static void -activate_uri (GtkWidget *menuitem, - const char *path) +activate_uri_on_screen (const char *path, + GdkScreen *screen) { GError *error = NULL; GFile *file; - GdkScreen *screen; char *escaped; char *scheme; char *url; - screen = menuitem_to_screen (menuitem); - scheme = g_uri_parse_scheme (path); if (scheme) { url = g_strdup (path); @@ -146,6 +143,13 @@ } static void +activate_uri (GtkWidget *menuitem, + const char *path) +{ + activate_uri_on_screen (path, menuitem_to_screen (menuitem)); +} + +static void activate_home_uri (GtkWidget *menuitem, gpointer data) { @@ -575,11 +579,12 @@ { PanelVolumeMountData *mount_data = user_data; GError *error; - char *primary; - char *name; error = NULL; if (!g_volume_mount_finish (G_VOLUME (source_object), res, &error)) { + char *primary; + char *name; + if (error->code != G_IO_ERROR_FAILED_HANDLED) { name = g_volume_get_name (G_VOLUME (source_object)); primary = g_strdup_printf (_("Unable to mount %s"), @@ -592,9 +597,19 @@ g_free (primary); } g_error_free (error); + } else { + GMount *mount; + GFile *root; + char *rootpath; + + mount = g_volume_get_mount (G_VOLUME (source_object)); + root = g_mount_get_root (mount); + rootpath = g_file_get_uri (root); + activate_uri_on_screen (rootpath, mount_data->screen); + g_object_unref (mount); + g_object_unref (root); + g_free (rootpath); } - - //FIXME: should we activate the root of the new mount? g_object_unref (mount_data->mount_op); g_slice_free (PanelVolumeMountData, mount_data); diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/gnome-panel/panel-recent.c /tmp/vKVLDG768l/gnome-panel-2.22.2/gnome-panel/panel-recent.c --- gnome-panel-2.22.1.3/gnome-panel/panel-recent.c 2008-04-15 22:57:56.000000000 +0200 +++ gnome-panel-2.22.2/gnome-panel/panel-recent.c 2008-05-26 18:10:44.000000000 +0200 @@ -41,11 +41,15 @@ GError **error) { char **env; + GFile *file; GAppInfo *app; GList *uris = NULL; gboolean ret; - app = g_app_info_get_default_for_type (mime_type, TRUE); + file = g_file_new_for_uri (uri); + app = g_app_info_get_default_for_type (mime_type, !g_file_is_native (file)); + g_object_unref (file); + if (app == NULL) { g_set_error (error, 0, 0, _("Could not find a suitable application.")); diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/idl/ChangeLog /tmp/vKVLDG768l/gnome-panel-2.22.2/idl/ChangeLog --- gnome-panel-2.22.1.3/idl/ChangeLog 2008-04-15 22:58:02.000000000 +0200 +++ gnome-panel-2.22.2/idl/ChangeLog 2008-05-26 18:10:54.000000000 +0200 @@ -1,3 +1,5 @@ +==================== 2.22.1.3 ==================== + ==================== 2.22.1.2 ==================== ==================== 2.22.1.1 ==================== diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/libpanel-applet/ChangeLog /tmp/vKVLDG768l/gnome-panel-2.22.2/libpanel-applet/ChangeLog --- gnome-panel-2.22.1.3/libpanel-applet/ChangeLog 2008-04-15 22:58:02.000000000 +0200 +++ gnome-panel-2.22.2/libpanel-applet/ChangeLog 2008-05-26 18:10:55.000000000 +0200 @@ -1,3 +1,5 @@ +==================== 2.22.1.3 ==================== + ==================== 2.22.1.2 ==================== ==================== 2.22.1.1 ==================== diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/NEWS /tmp/vKVLDG768l/gnome-panel-2.22.2/NEWS --- gnome-panel-2.22.1.3/NEWS 2008-04-15 23:04:38.000000000 +0200 +++ gnome-panel-2.22.2/NEWS 2008-05-26 18:41:21.000000000 +0200 @@ -1,3 +1,33 @@ +============== +Version 2.22.2 +============== + + Panel + + * When opening a recent file, do not only look for applications that + can open URI; if the file is gio-native (file://), then it's fine to + get applications that can open paths (Vincent) + * Open a mount after having mounted it since nautilus won't + automatically open it anymore (Vincent) + * Fix dragging of launchers from the Add to panel dialog (Vincent) + + Clock Applet + + * Make the help button on the preference dialog work (Matthias Clasen) + * Fix timezone file handling to correctly recognize timezone magic + header (Matthias Clasen) + * Accept Google URI for Google calendars appointments (Vincent) + * Put the initial focus in the name entry for the Edit location dialog + (Vincent) + * Rename the clock applet PolicyKit .policy file so that it validates + and add some more information there (Vincent) + + Translators + + * Yavor Doganov (bg) + * Shankar Prasad (kn) + * Eskild Hustvedt (nn) + ================ Version 2.22.1.3 ================ diff -Nru --exclude configure --exclude help --exclude po /tmp/uqKv4iOrBY/gnome-panel-2.22.1.3/README /tmp/vKVLDG768l/gnome-panel-2.22.2/README --- gnome-panel-2.22.1.3/README 2008-04-15 22:58:41.000000000 +0200 +++ gnome-panel-2.22.2/README 2008-05-26 18:26:08.000000000 +0200 @@ -1,5 +1,5 @@ -gnome-panel 2.22.1.3 -==================== +gnome-panel 2.22.2 +================== This package is free software and is part of the GNOME 2.0 project.