[Xfce4-commits] [xfce/xfce4-power-manager] 08/63: Plugin: Stop crashing!

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit 816dc11fa1d70a8ef5ef2fcbe20bd489b18fb01a
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Thu Mar 5 19:11:06 2015 +0300

    Plugin: Stop crashing!
    
    Also no more deprecated warnings.
---
 .../power-manager-plugin/power-manager-button.c        |    2 +-
 panel-plugins/power-manager-plugin/scalemenuitem.c     |   14 --------------
 settings/xfpm-settings-main.c                          |   16 +++++++++-------
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index 874a100..38121c7 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -416,7 +416,7 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button,
     if (button->priv->menu && battery_device->menu_item)
     {
         GList *children, *iter;
-        GtkWidget *box, *image;
+        GtkWidget *box;
         gtk_menu_item_set_label (GTK_MENU_ITEM (battery_device->menu_item), details);
 
         /* update the image, keep track of the signal ids and the img
diff --git a/panel-plugins/power-manager-plugin/scalemenuitem.c b/panel-plugins/power-manager-plugin/scalemenuitem.c
index 74977c8..d16ff74 100644
--- a/panel-plugins/power-manager-plugin/scalemenuitem.c
+++ b/panel-plugins/power-manager-plugin/scalemenuitem.c
@@ -46,8 +46,6 @@ static gboolean scale_menu_item_motion_notify_event     (GtkWidget          *men
                                                          GdkEventMotion     *event);
 static gboolean scale_menu_item_grab_broken             (GtkWidget          *menuitem,
                                                          GdkEventGrabBroken *event);
-static void     scale_menu_item_grab_notify             (GtkWidget          *menuitem,
-                                                         gboolean            was_grabbed);
 static void     scale_menu_item_parent_set              (GtkWidget          *item,
                                                          GtkWidget          *previous_parent);
 static void     update_packing                          (ScaleMenuItem  *    self);
@@ -110,7 +108,6 @@ scale_menu_item_class_init (ScaleMenuItemClass *item_class)
   widget_class->button_release_event = scale_menu_item_button_release_event;
   widget_class->motion_notify_event  = scale_menu_item_motion_notify_event;
   widget_class->grab_broken_event    = scale_menu_item_grab_broken;
-  widget_class->grab_notify          = scale_menu_item_grab_notify;
   widget_class->parent_set           = scale_menu_item_parent_set;
 
 
@@ -336,17 +333,6 @@ scale_menu_item_motion_notify_event (GtkWidget      *menuitem,
   return TRUE;
 }
 
-static void
-scale_menu_item_grab_notify (GtkWidget *menuitem,
-                             gboolean was_grabbed)
-{
-  ScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
-
-  TRACE("entering");
-
-  GTK_WIDGET_GET_CLASS (priv->scale)->grab_notify (priv->scale, was_grabbed);
-}
-
 static gboolean
 scale_menu_item_grab_broken (GtkWidget *menuitem,
                              GdkEventGrabBroken *event)
diff --git a/settings/xfpm-settings-main.c b/settings/xfpm-settings-main.c
index 6a1d244..57d3669 100644
--- a/settings/xfpm-settings-main.c
+++ b/settings/xfpm-settings-main.c
@@ -111,13 +111,15 @@ int main (int argc, char **argv)
 
     while ( !xfpm_dbus_name_has_owner (dbus_g_connection_get_connection(bus), "org.xfce.PowerManager") )
     {
-	g_print(_("Xfce power manager is not running"));
-	g_print("\n");
-	start_xfpm_if_not_running =
-	    xfce_dialog_confirm (NULL, 
-				 GTK_STOCK_EXECUTE,
-				 _("Run"), NULL,
-				 _("Xfce4 Power Manager is not running, do you want to launch it now?"));
+	GtkWidget *startw;
+
+	startw = gtk_message_dialog_new (NULL,
+                                         GTK_DIALOG_MODAL,
+                                         GTK_MESSAGE_QUESTION,
+                                         GTK_BUTTONS_YES_NO,
+                                         _("Xfce4 Power Manager is not running, do you want to launch it now?"));
+	start_xfpm_if_not_running = gtk_dialog_run (GTK_DIALOG (startw));
+	gtk_widget_destroy (startw);
 
 	if ( start_xfpm_if_not_running ) 
 	{

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.