[Goodies-commits] r2473 - in xfce4-volstatus-icon/trunk: po xfce4-volstatus-icon

Brian Tarricone kelnos at xfce.org
Thu Feb 1 22:06:52 CET 2007


Author: kelnos
Date: 2007-02-01 21:06:51 +0000 (Thu, 01 Feb 2007)
New Revision: 2473

Modified:
   xfce4-volstatus-icon/trunk/po/POTFILES.in
   xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/Makefile.am
   xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/main.c
   xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/xfce-volstatus-icon.c
Log:
fix a bunch of warnings, make some function static (i guess i'm asleep
today), ifdef a couple gtk 2.12-isms, and make it more or less work.


Modified: xfce4-volstatus-icon/trunk/po/POTFILES.in
===================================================================
--- xfce4-volstatus-icon/trunk/po/POTFILES.in	2007-02-01 20:48:19 UTC (rev 2472)
+++ xfce4-volstatus-icon/trunk/po/POTFILES.in	2007-02-01 21:06:51 UTC (rev 2473)
@@ -1 +1 @@
-src/ac-network-manager.c
+xfce4-volstatus-icon/xfce-volstatus-icon.c

Modified: xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/Makefile.am
===================================================================
--- xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/Makefile.am	2007-02-01 20:48:19 UTC (rev 2472)
+++ xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/Makefile.am	2007-02-01 21:06:51 UTC (rev 2473)
@@ -6,6 +6,7 @@
 	xfce-volstatus-icon.h
 
 xfce4_volstatus_icon_CFLAGS = \
+	-DEXO_API_SUBJECT_TO_CHANGE \
 	-DLOCALEDIR=\"$(localedir)\" \
 	@GTHREAD_CFLAGS@ \
 	@GTK_CFLAGS@ \

Modified: xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/main.c
===================================================================
--- xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/main.c	2007-02-01 20:48:19 UTC (rev 2472)
+++ xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/main.c	2007-02-01 21:06:51 UTC (rev 2473)
@@ -78,9 +78,9 @@
 }
 
 static void
-xfce_volstatus_volumes_added(ThunarVfsVolumeManager *manager,
-                             GList *volumes,
-                             gpointer user_data)
+xfce_volstatus_volumes_removed(ThunarVfsVolumeManager *manager,
+                               GList *volumes,
+                               gpointer user_data)
 {
     GList *l;
     
@@ -98,8 +98,7 @@
 {
     GtkStatusIcon *icon;
     ThunarVfsVolumeManager *manager;
-    GList *volumes, *l;
-    ThunarVfsVolume *volume;
+    GList *volumes;
     
     xfce_textdomain(PACKAGE, LOCALEDIR, "UTF-8");
     
@@ -111,18 +110,18 @@
     gtk_status_icon_set_visible(icon, FALSE);
     
     manager = thunar_vfs_volume_manager_get_default();
-    g_signal_connect(G_OBJECT(managger), "volumes-added",
+    g_signal_connect(G_OBJECT(manager), "volumes-added",
                      G_CALLBACK(xfce_volstatus_volumes_added), icon);
-    g_signal_connect(G_OBJECT(managger), "volumes-removed",
+    g_signal_connect(G_OBJECT(manager), "volumes-removed",
                      G_CALLBACK(xfce_volstatus_volumes_removed), icon);
     
     volumes = thunar_vfs_volume_manager_get_volumes(manager);
-    xfce_volstatus_volumes_added(manager, volumes);
+    xfce_volstatus_volumes_added(manager, volumes, icon);
     
     signal(SIGPIPE, SIG_IGN);
     signal(SIGINT, sighandler);
     signal(SIGQUIT, sighandler);
-    signal(SIGTERM(sighandler);
+    signal(SIGTERM, sighandler);
     
     gtk_main();
     

Modified: xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/xfce-volstatus-icon.c
===================================================================
--- xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/xfce-volstatus-icon.c	2007-02-01 20:48:19 UTC (rev 2472)
+++ xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/xfce-volstatus-icon.c	2007-02-01 21:06:51 UTC (rev 2473)
@@ -38,28 +38,26 @@
     GtkStatusIconClass parent;
 } XfceVolstatusIconClass;
 
-void xfce_volstatus_icon_class_init(XfceVolstatusIconClass *klass);
+static void xfce_volstatus_icon_class_init(XfceVolstatusIconClass *klass);
 
-void xfce_volstatus_icon_init(XfceVolstatusIcon *icon);
-void xfce_volstatus_icon_finalize(GObject *obj);
+static void xfce_volstatus_icon_init(XfceVolstatusIcon *icon);
+static void xfce_volstatus_icon_finalize(GObject *obj);
 
-void xfce_volstatus_icon_activate(GtkStatusIcon *status_icon,
-                                  gpointer user_data);
-void xfce_volstatus_icon_popup_menu(GtkStatusIcon *status_icon,
-                                    guint button,
-                                    guint activate_time,
-                                    gpointer user_data);
+static void xfce_volstatus_icon_activate(GtkStatusIcon *status_icon);
+static void xfce_volstatus_icon_popup_menu(GtkStatusIcon *status_icon,
+                                           guint button,
+                                           guint activate_time);
 
-void xfce_volstatus_icon_menu_deactivate(GtkWidget *widget,
-                                         gpointer user_data);
-void xfce_volstatus_icon_volume_activate(GtkMenuItem *mi,
-                                         gpointer user_data);
+static void xfce_volstatus_icon_menu_deactivate(GtkWidget *widget,
+                                                gpointer user_data);
+static void xfce_volstatus_icon_volume_activate(GtkMenuItem *mi,
+                                                gpointer user_data);
 
 
 G_DEFINE_TYPE(XfceVolstatusIcon, xfce_volstatus_icon, GTK_TYPE_STATUS_ICON)
 
 
-void
+static void
 xfce_volstatus_icon_class_init(XfceVolstatusIconClass *klass)
 {
     GObjectClass *object_class = (GObjectClass *)klass;
@@ -71,13 +69,13 @@
     icon_class->popup_menu = xfce_volstatus_icon_popup_menu;
 }
 
-void
+static void
 xfce_volstatus_icon_init(XfceVolstatusIcon *icon)
 {
     
 }
 
-void
+static void
 xfce_volstatus_icon_finalize(GObject *obj)
 {
     XfceVolstatusIcon *icon = XFCE_VOLSTATUS_ICON(obj);
@@ -89,25 +87,25 @@
 }
 
 
-void
-xfce_volstatus_icon_activate(GtkStatusIcon *status_icon,
-                             gpointer user_data)
+static void
+xfce_volstatus_icon_activate(GtkStatusIcon *status_icon)
 {
-    /* FIXME: do something */
+    /* FIXME: bring up a dialog with a list of stuff */
 }
 
-void
+static void
 xfce_volstatus_icon_popup_menu(GtkStatusIcon *status_icon,
                                guint button,
-                               guint activate_time,
-                               gpointer user_data)
+                               guint activate_time)
 {
     XfceVolstatusIcon *icon = XFCE_VOLSTATUS_ICON(status_icon);
     GtkWidget *menu, *mi;
     
     menu = gtk_menu_new();
+#if GTK_CHECK_VERSION(2, 12, 0)
     gtk_menu_set_screen(GTK_MENU(menu),
                         gtk_status_icon_get_screen(status_icon));
+#endif
     gtk_widget_show(menu);
     g_signal_connect(G_OBJECT(menu), "deactivate",
                      G_CALLBACK(xfce_volstatus_icon_menu_deactivate), icon);
@@ -147,25 +145,24 @@
 
 
 
-gboolean
+static gboolean
 xfce_volstatus_icon_menu_destroy_idled(gpointer data)
 {
     gtk_widget_destroy(GTK_WIDGET(data));
     return FALSE;
 }
 
-void
+static void
 xfce_volstatus_icon_menu_deactivate(GtkWidget *widget,
                                     gpointer user_data)
 {
-    g_idle_add(xfce_status_icon_menu_destroy_idled, widget);
+    g_idle_add(xfce_volstatus_icon_menu_destroy_idled, widget);
 }
 
-void
+static void
 xfce_volstatus_icon_volume_activate(GtkMenuItem *mi,
                                     gpointer user_data)
 {
-    XfceVolstatusIcon *icon = XFCE_VOLSTATUS_ICON(user_data);
     ThunarVfsVolume *volume = g_object_get_data(G_OBJECT(mi),
                                                 "thunar-vfs-volume");
     gboolean ret = TRUE;
@@ -182,7 +179,7 @@
         gchar *primary = g_strdup_printf(_("Unable to remove \"%s\""),
                                          thunar_vfs_volume_get_name(volume));
         xfce_message_dialog(NULL, _("Removal Failure"),
-                            GTK_STOCK_ICON_WARNING, primary, error->message,
+                            GTK_STOCK_DIALOG_WARNING, primary, error->message,
                             GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
         g_free(primary);
         g_error_free(error);
@@ -210,7 +207,9 @@
         icon_name = "gnome-dev-removable";
     
     return g_object_new(XFCE_TYPE_VOLSTATUS_ICON,
+#if GTK_CHECK_VERSION(2, 12, 0)
                         "screen", screen,
+#endif
                         icon_name ? "icon-name" : "stock",
                         icon_name ? icon_name : GTK_STOCK_HARDDISK,
                         NULL);




More information about the Goodies-commits mailing list