diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-08-24 09:13:07 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-08-24 09:13:07 +0800 |
| commit | da26571544ddb43359ceb3f3f0792f4e6588aad9 (patch) | |
| tree | cd6594832f2b8c15e97c6b01625a772f90c2553d /x11/gnomeapplets2/files | |
| parent | 0a4cbd92df92bc28904f7486afc1bdbe04040131 (diff) | |
| download | marcuscom-ports-da26571544ddb43359ceb3f3f0792f4e6588aad9.tar marcuscom-ports-da26571544ddb43359ceb3f3f0792f4e6588aad9.tar.gz marcuscom-ports-da26571544ddb43359ceb3f3f0792f4e6588aad9.tar.bz2 marcuscom-ports-da26571544ddb43359ceb3f3f0792f4e6588aad9.tar.lz marcuscom-ports-da26571544ddb43359ceb3f3f0792f4e6588aad9.tar.xz marcuscom-ports-da26571544ddb43359ceb3f3f0792f4e6588aad9.tar.zst marcuscom-ports-da26571544ddb43359ceb3f3f0792f4e6588aad9.zip | |
Update to 2.11.92.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4607 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnomeapplets2/files')
| -rw-r--r-- | x11/gnomeapplets2/files/patch-battstat_battstat_applet.c | 30 | ||||
| -rw-r--r-- | x11/gnomeapplets2/files/patch-drivemount_drive-button.c | 23 |
2 files changed, 21 insertions, 32 deletions
diff --git a/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c b/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c index 3bee2ecc8..a95b7b569 100644 --- a/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c +++ b/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c @@ -1,21 +1,21 @@ ---- battstat/battstat_applet.c.orig Sun Jul 3 17:25:06 2005 -+++ battstat/battstat_applet.c Sun Jul 3 17:25:36 2005 -@@ -446,14 +446,15 @@ battery_full_notify (void) +--- battstat/battstat_applet.c.orig Fri Aug 19 22:13:49 2005 ++++ battstat/battstat_applet.c Tue Aug 23 20:37:13 2005 +@@ -430,14 +430,14 @@ battery_full_notify (GtkWidget *applet) static void - battery_full_dialog( void ) + battery_full_dialog (GtkWidget *applet) { -+ GtkWidget *dialog, *hbox, *image, *label; -+ GdkPixbuf *pixbuf; -+ gchar *new_label; -+ - /* first attempt to use libnotify */ - if (battery_full_notify ()) - return; - -- GtkWidget *dialog, *hbox, *image, *label; -- GdkPixbuf *pixbuf; +- /* first attempt to use libnotify */ +- if (battery_full_notify (applet)) +- return; +- + GtkWidget *dialog, *hbox, *image, *label; + GdkPixbuf *pixbuf; -- gchar *new_label; + gchar *new_label; ++ /* first attempt to use libnotify */ ++ if (battery_full_notify (applet)) ++ return; ++ dialog = gtk_dialog_new_with_buttons ( _("Battery Notice"), NULL, diff --git a/x11/gnomeapplets2/files/patch-drivemount_drive-button.c b/x11/gnomeapplets2/files/patch-drivemount_drive-button.c index 98152da4a..f26e3121e 100644 --- a/x11/gnomeapplets2/files/patch-drivemount_drive-button.c +++ b/x11/gnomeapplets2/files/patch-drivemount_drive-button.c @@ -1,5 +1,5 @@ ---- drivemount/drive-button.c.orig Sun Jul 3 17:18:34 2005 -+++ drivemount/drive-button.c Sun Jul 3 17:23:33 2005 +--- drivemount/drive-button.c.orig Tue Aug 23 05:16:27 2005 ++++ drivemount/drive-button.c Tue Aug 23 20:37:43 2005 @@ -24,6 +24,7 @@ # include <config.h> #endif @@ -8,7 +8,7 @@ #include "drive-button.h" #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -@@ -641,11 +642,13 @@ run_command (DriveButton *self, const ch +@@ -710,11 +711,13 @@ run_command (DriveButton *self, const ch GList *volumes; GnomeVFSVolume *volume; @@ -24,7 +24,7 @@ g_free (uri); gnome_vfs_drive_get_display_name (self->drive); -@@ -725,6 +728,11 @@ drive_button_ensure_popup (DriveButton * +@@ -794,6 +797,11 @@ drive_button_ensure_popup (DriveButton * char *display_name, *tmp, *label; int action; GtkWidget *item; @@ -36,18 +36,7 @@ if (self->popup_menu) return; -@@ -762,9 +770,7 @@ drive_button_ensure_popup (DriveButton * - } - } - -- GList *volumes; -- GnomeVFSVolume *volume = NULL; -- GnomeVFSDeviceType volume_type = device_type; -+ volume_type = device_type; - - volumes = gnome_vfs_drive_get_mounted_volumes (self->drive); - if (volumes != NULL) -@@ -801,8 +807,7 @@ drive_button_ensure_popup (DriveButton * +@@ -869,8 +877,7 @@ drive_button_ensure_popup (DriveButton * g_free (display_name); display_name = tmp; @@ -55,5 +44,5 @@ - const char *action_icon = GTK_STOCK_OPEN; + callback = G_CALLBACK (open_drive); - switch (volume_type) { + switch (device_type) { case GNOME_VFS_DEVICE_TYPE_VIDEO_DVD: |