Removing 02-desktop-number.patch, it's included into upstream.
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Thu, 31 Jul 2014 00:13:03 +0000 (03:13 +0300)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Thu, 21 Aug 2014 16:17:32 +0000 (19:17 +0300)
debian/patches/02-desktop-number.patch [deleted file]
debian/patches/series

diff --git a/debian/patches/02-desktop-number.patch b/debian/patches/02-desktop-number.patch
deleted file mode 100644 (file)
index c004aa1..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-Author: Julien Lavergne <gilir@ubuntu.com>
-Description: Add configuration for desktop number for the pager plugin.
-
-diff -Naurp lxpanel.orig/src/plugins/pager.c lxpanel/src/plugins/pager.c
---- lxpanel.orig/src/plugins/pager.c   2011-07-29 14:37:01.000000000 +0200
-+++ lxpanel/src/plugins/pager.c        2012-04-20 14:38:05.935515180 +0200
-@@ -811,6 +811,80 @@ static void pager_destructor(Plugin * p)
-     g_free(pg);
- }
-+/* Callback when the configuration dialog is to be shown. */
-+static void deskno_configure(Plugin * p, GtkWindow * parent)
-+{
-+
-+    GdkScreen *screen = gdk_screen_get_default();
-+    const char *wm_name = gdk_x11_screen_get_window_manager_name(screen);
-+    GError *error = NULL;
-+    const gchar *command_line = NULL;
-+
-+    if(g_strcmp0(wm_name, "Openbox") == 0)
-+    {
-+        if (g_find_program_in_path("obconf"))
-+        {
-+            command_line = "obconf --tab 6";
-+        }
-+    }
-+    else if (g_strcmp0(wm_name, "compiz") == 0)
-+    {
-+         if (g_find_program_in_path("ccsm"))
-+         {
-+              command_line = "ccsm";
-+
-+         }
-+         else if (g_find_program_in_path("simple-ccsm"))
-+         {
-+              command_line = "simple-ccsm";
-+         }
-+    }
-+    else
-+    {
-+
-+        GtkWidget* msg;
-+
-+        msg = gtk_message_dialog_new( NULL,
-+                                      0,
-+                                      GTK_MESSAGE_ERROR,
-+                                      GTK_BUTTONS_OK,
-+                                      _("Error, only openbox and compiz are supported") );
-+        gtk_dialog_run( GTK_DIALOG(msg) );
-+        gtk_widget_destroy( msg );
-+
-+    }
-+
-+    if (command_line)
-+    {
-+        gdk_spawn_command_line_on_screen(screen,
-+                                         command_line,
-+                                         &error);
-+    }
-+
-+    else
-+    {
-+
-+        GtkWidget* msg;
-+
-+        msg = gtk_message_dialog_new( NULL,
-+                                      0,
-+                                      GTK_MESSAGE_ERROR,
-+                                      GTK_BUTTONS_OK,
-+                                      _("Error, you need to install obconf, ccsm of simple-ccsm") );
-+        gtk_dialog_run( GTK_DIALOG(msg) );
-+        gtk_widget_destroy( msg );
-+
-+    }
-+
-+       if (error)
-+       {
-+           g_print("%s\n", error->message);
-+
-+               g_free (error);
-+    }
-+
-+}
-+
- /* Callback when panel configuration changes. */
- static void pager_panel_configuration_changed(Plugin * p)
- {
-@@ -836,7 +910,7 @@ PluginClass pager_plugin_class = {
-     constructor : pager_constructor,
-     destructor  : pager_destructor,
--    config : NULL,
-+    config : deskno_configure,
-     save : NULL,
-     panel_configuration_changed : pager_panel_configuration_changed
- };
index fd252a8..cf92e56 100644 (file)
@@ -1,2 +1 @@
 01-default-config.patch
-02-desktop-number.patch