[Xfce4-commits] <xfce4-places-plugin:master> Clean-up after removing xfce4-popup-places.c

Andrzej noreply at xfce.org
Fri Sep 28 18:16:01 CEST 2012


Updating branch refs/heads/master
         to 256c05459ee2e96746ea94751e9c9f71b81f5c16 (commit)
       from 48bd2394edc8d6cc4b56b0b4aa5780e985038040 (commit)

commit 256c05459ee2e96746ea94751e9c9f71b81f5c16
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Fri Sep 28 17:08:53 2012 +0100

    Clean-up after removing xfce4-popup-places.c

 panel-plugin/view.c |   52 ---------------------------------------------------
 po/POTFILES.in      |    3 +-
 2 files changed, 1 insertions(+), 54 deletions(-)

diff --git a/panel-plugin/view.c b/panel-plugin/view.c
index 1b394f8..86bcb4c 100644
--- a/panel-plugin/view.c
+++ b/panel-plugin/view.c
@@ -65,7 +65,6 @@
 #include "model_system.h"
 #include "model_volumes.h"
 #include "model_user.h"
-#include "xfce4-popup-places.h"
 #include "button.h"
 
 #ifdef HAVE_LIBNOTIFY
@@ -893,54 +892,6 @@ pview_remote_event(XfcePanelPlugin *panel_plugin,
   return FALSE;
 }
 
-static gboolean
-pview_popup_command_message_received(GtkWidget *widget,
-                                     GdkEventClient *ev,
-                                     PlacesView *view)
-{
-    if (G_LIKELY (ev->data_format == 8 && *(ev->data.b) != '\0'
-                  && !g_ascii_strcasecmp (PLACES_MSG_MENU, ev->data.b))){
-        DBG ("Message received: '%s'", ev->data.b);
-
-        pview_open_menu (view);
-        return TRUE;
-    }
-
-    DBG("Bad message received");
-    return FALSE;
-}
-
-static gboolean
-pview_popup_command_set_selection(PlacesView *view)
-{
-    GdkScreen          *gscreen;
-    gchar               selection_name[256];
-    Atom                selection_atom;
-    Window              id;
-
-    id = GDK_WINDOW_XID (GTK_WIDGET (view->plugin)->window);
-
-    gscreen = gtk_widget_get_screen (GTK_WIDGET(view->plugin));
-
-    g_snprintf (selection_name, 256,
-                XFCE_PLACES_SELECTION"%d",
-                gdk_screen_get_number (gscreen));
-    
-    selection_atom = XInternAtom (GDK_DISPLAY (), selection_name, FALSE);
-
-    if (XGetSelectionOwner (GDK_DISPLAY (), selection_atom))
-        return FALSE;
-
-    XSetSelectionOwner (GDK_DISPLAY (), selection_atom, id, GDK_CURRENT_TIME);
-
-    g_signal_connect (GTK_WIDGET(view->plugin),
-                      "client-event",
-                      G_CALLBACK (pview_popup_command_message_received),
-                      view);
-
-    return TRUE;
-}
-
 /********** Initialization & Finalization **********/
 PlacesView*
 places_view_init(XfcePanelPlugin *plugin)
@@ -996,9 +947,6 @@ places_view_init(XfcePanelPlugin *plugin)
     g_signal_connect(G_OBJECT(view->plugin), "remote-event",
                      G_CALLBACK(pview_remote_event), view);
 
-    /* set selection for xfce4-popup-places */
-    pview_popup_command_set_selection(view);
-
     DBG("done");
 
     return view;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 34c349f..5628241 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,5 +19,4 @@ panel-plugin/button.c
 panel-plugin/button.h
 panel-plugin/support.c
 panel-plugin/support.h
-panel-plugin/xfce4-popup-places.c
-panel-plugin/xfce4-popup-places.h
+panel-plugin/xfce4-popup-places.sh


More information about the Xfce4-commits mailing list