Move PluginConfType definition into misc.h header file.
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Tue, 4 Feb 2014 23:27:08 +0000 (01:27 +0200)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Tue, 4 Feb 2014 23:27:08 +0000 (01:27 +0200)
src/configurator.c
src/misc.h
src/private.h

index 7c93d4a..64f4c44 100644 (file)
@@ -1352,7 +1352,7 @@ static GtkWidget *_lxpanel_generic_config_dlg(const char *title, Panel *p,
         GtkWidget* label = gtk_label_new( name );
         GtkWidget* entry = NULL;
         gpointer val = va_arg( args, gpointer );
-        enum _PluginConfType type = va_arg( args, enum _PluginConfType );
+        PluginConfType type = va_arg( args, PluginConfType );
         switch( type )
         {
             case CONF_TYPE_STR:
index 4890c08..501d2a5 100644 (file)
@@ -91,7 +91,17 @@ GtkWidget * fb_button_new_from_file_with_label(
 */
 GtkWidget* recreate_box( GtkBox* oldbox, GtkOrientation orientation );
 
-/* Parameters: const char* name, gpointer ret_value, GType type, ....NULL */
+typedef enum {
+    CONF_TYPE_STR,
+    CONF_TYPE_INT,
+    CONF_TYPE_BOOL,
+    CONF_TYPE_FILE,
+    CONF_TYPE_FILE_ENTRY,
+    CONF_TYPE_DIRECTORY_ENTRY,
+    CONF_TYPE_TRIM
+} PluginConfType;
+
+/* Parameters: const char* name, gpointer ret_value, PluginConfType type, ....NULL */
 extern GtkWidget *lxpanel_generic_config_dlg(const char *title, Panel *panel,
                                              GSourceFunc apply_func,
                                              GtkWidget *plugin,
index 8ecdb03..51711bb 100644 (file)
@@ -145,16 +145,6 @@ extern FbEv *fbev;
 /* Extracted from misc.h */
 typedef struct _Plugin Plugin;
 
-enum _PluginConfType {
-    CONF_TYPE_STR,
-    CONF_TYPE_INT,
-    CONF_TYPE_BOOL,
-    CONF_TYPE_FILE,
-    CONF_TYPE_FILE_ENTRY,
-    CONF_TYPE_DIRECTORY_ENTRY,
-    CONF_TYPE_TRIM
-};
-
 enum { LINE_NONE, LINE_BLOCK_START, LINE_BLOCK_END, LINE_VAR };
 
 typedef struct {