[Xfce4-commits] <xfce4-panel:master> Quick fix of compilation errors after merge of nick/gtk3 branch.

[Nick Schermer]

Updating branch refs/heads/master
         to 058544623d9a8c035174972d2a9dc1228dc9e6d8 (commit)
       from 6faa922db9eb527415d48e5890e663cf7f3fab66 (commit)

commit 058544623d9a8c035174972d2a9dc1228dc9e6d8
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Sun Aug 25 23:23:04 2013 +0100

    Quick fix of compilation errors after merge of nick/gtk3 branch.
    
    Gtk3 plugins (e.g. xfce4-indicator-plugin/master) are not recognized
    (treated as gtk2 ones).

 panel/panel-module.c                  |    5 +++--
 panel/panel-plugin-external-wrapper.c |    2 +-
 panel/panel-plugin-external-wrapper.h |    1 -
 panel/panel-plugin-external.c         |   18 ------------------
 panel/panel-plugin-external.h         |    1 -
 5 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/panel/panel-module.c b/panel/panel-module.c
index 48d9745..dc947ba 100644
--- a/panel/panel-module.c
+++ b/panel/panel-module.c
@@ -21,6 +21,7 @@
 #endif
 
 #include <gmodule.h>
+#include <exo/exo.h>
 #include <glib/gstdio.h>
 #include <libxfce4util/libxfce4util.h>
 
@@ -309,8 +310,8 @@ panel_module_new_from_desktop_file (const gchar *filename,
   const gchar *module_unique;
   gboolean     found;
 
-  panel_return_val_if_fail (!panel_str_is_empty (filename), NULL);
-  panel_return_val_if_fail (!panel_str_is_empty (name), NULL);
+  panel_return_val_if_fail (!exo_str_is_empty (filename), NULL);
+  panel_return_val_if_fail (!exo_str_is_empty (name), NULL);
 
   rc = xfce_rc_simple_open (filename, TRUE);
   if (G_UNLIKELY (rc == NULL))
diff --git a/panel/panel-plugin-external-wrapper.c b/panel/panel-plugin-external-wrapper.c
index 6b61713..12da849 100644
--- a/panel/panel-plugin-external-wrapper.c
+++ b/panel/panel-plugin-external-wrapper.c
@@ -220,7 +220,7 @@ panel_plugin_external_wrapper_get_argv (PanelPluginExternal   *external,
   argv[PLUGIN_ARGV_0] = g_strjoin ("-", WRAPPER_BIN, panel_module_get_api (external->module), NULL);
   argv[PLUGIN_ARGV_FILENAME] = g_strdup (panel_module_get_filename (external->module));
   argv[PLUGIN_ARGV_UNIQUE_ID] = g_strdup_printf ("%d", external->unique_id);;
-  argv[PLUGIN_ARGV_SOCKET_ID] = g_strdup_printf ("%lu", gtk_socket_get_id (GTK_SOCKET (external)));;
+  argv[PLUGIN_ARGV_SOCKET_ID] = g_strdup_printf ("%u", gtk_socket_get_id (GTK_SOCKET (external)));;
   argv[PLUGIN_ARGV_NAME] = g_strdup (panel_module_get_name (external->module));
   argv[PLUGIN_ARGV_DISPLAY_NAME] = g_strdup (panel_module_get_display_name (external->module));
   argv[PLUGIN_ARGV_COMMENT] = g_strdup (panel_module_get_comment (external->module));
diff --git a/panel/panel-plugin-external-wrapper.h b/panel/panel-plugin-external-wrapper.h
index e4bb1b2..eaa3ee9 100644
--- a/panel/panel-plugin-external-wrapper.h
+++ b/panel/panel-plugin-external-wrapper.h
@@ -40,7 +40,6 @@ GType      panel_plugin_external_wrapper_get_type (void) G_GNUC_CONST;
 
 GtkWidget *panel_plugin_external_wrapper_new      (PanelModule  *module,
                                                    gint          unique_id,
-                                                   gboolean      is_gtk3,
                                                    gchar       **arguments) G_GNUC_MALLOC;
 
 G_END_DECLS
diff --git a/panel/panel-plugin-external.c b/panel/panel-plugin-external.c
index f26adf7..b9e8f36 100644
--- a/panel/panel-plugin-external.c
+++ b/panel/panel-plugin-external.c
@@ -133,7 +133,6 @@ enum
   PROP_0,
   PROP_MODULE,
   PROP_UNIQUE_ID,
-  PROP_IS_GTK3,
   PROP_ARGUMENTS
 };
 
@@ -175,14 +174,6 @@ panel_plugin_external_class_init (PanelPluginExternalClass *klass)
                                                      | G_PARAM_CONSTRUCT_ONLY));
 
   g_object_class_install_property (gobject_class,
-                                   PROP_IS_GTK3,
-                                   g_param_spec_boolean ("is-gtk3",
-                                                         NULL, NULL,
-                                                         FALSE,
-                                                         EXO_PARAM_READWRITE
-                                                         | G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (gobject_class,
                                    PROP_MODULE,
                                    g_param_spec_object ("module",
                                                         NULL, NULL,
@@ -210,7 +201,6 @@ panel_plugin_external_init (PanelPluginExternal *external)
   external->show_configure = FALSE;
   external->show_about = FALSE;
   external->unique_id = -1;
-  external->is_gtk3 = FALSE;
 
   external->priv->arguments = NULL;
   external->priv->queue = NULL;
@@ -291,10 +281,6 @@ panel_plugin_external_get_property (GObject    *object,
       g_value_set_int (value, external->unique_id);
       break;
 
-    case PROP_IS_GTK3:
-      g_value_set_boolean (value, external->is_gtk3);
-      break;
-
     case PROP_ARGUMENTS:
       g_value_set_boxed (value, external->priv->arguments);
       break;
@@ -325,10 +311,6 @@ panel_plugin_external_set_property (GObject      *object,
       external->unique_id = g_value_get_int (value);
       break;
 
-    case PROP_IS_GTK3:
-      external->is_gtk3 = g_value_get_boolean (value);
-      break;
-
     case PROP_ARGUMENTS:
       external->priv->arguments = g_value_dup_boxed (value);
       break;
diff --git a/panel/panel-plugin-external.h b/panel/panel-plugin-external.h
index 31774fa..5163447 100644
--- a/panel/panel-plugin-external.h
+++ b/panel/panel-plugin-external.h
@@ -70,7 +70,6 @@ struct _PanelPluginExternal
    * implementations of the abstract object */
   guint                       show_configure : 1;
   guint                       show_about : 1;
-  gboolean                    is_gtk3;
 };
 
 typedef struct