[Goodies-commits] r3208 - xfce4-places-plugin/trunk/panel-plugin

[Diego Ongaro]

Author: ongardie
Date: 2007-09-12 03:32:09 +0000 (Wed, 12 Sep 2007)
New Revision: 3208

Modified:
   xfce4-places-plugin/trunk/panel-plugin/cfg.c
   xfce4-places-plugin/trunk/panel-plugin/view.c
   xfce4-places-plugin/trunk/panel-plugin/view.h
Log:
Places: Added inline wrappers for cfg's interface to view.


Modified: xfce4-places-plugin/trunk/panel-plugin/cfg.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/cfg.c	2007-09-12 03:18:08 UTC (rev 3207)
+++ xfce4-places-plugin/trunk/panel-plugin/cfg.c	2007-09-12 03:32:09 UTC (rev 3208)
@@ -49,7 +49,6 @@
 #endif
 static void     pcfg_menu_cb(GtkToggleButton*, PlacesCfg*);
 static void     pcfg_model_cb(GtkToggleButton*, PlacesCfg*);
-//static void     pcfg_dialog_cb(GtkDialog*, gint response, PlacesCfg*);
 static void     pcfg_open_dialog(PlacesCfg*);
 
 
@@ -263,7 +262,7 @@
     cfg->show_button_icon  = (option == 0 || option == 2);
     cfg->show_button_label = (option == 1 || option == 2);
 
-    cfg->view_iface->update_button(cfg->view_iface->places_view);
+    places_view_cfg_iface_update_button(cfg->view_iface);
 }
 
 static gboolean
@@ -279,7 +278,7 @@
         gtk_entry_set_text(GTK_ENTRY(label_entry), cfg->label);
     }
 
-    cfg->view_iface->update_button(cfg->view_iface->places_view);
+    places_view_cfg_iface_update_button(cfg->view_iface);
 
     return FALSE;
 }
@@ -292,7 +291,8 @@
     
     cfg->search_cmd = g_strstrip(g_strdup(gtk_entry_get_text(GTK_ENTRY(label_entry))));
 
-    cfg->view_iface->update_menu(cfg->view_iface->places_view);
+    /* TODO: you can't open menu when the field is focused */
+    places_view_cfg_iface_update_menu(cfg->view_iface);
 
     return FALSE;
 }
@@ -303,7 +303,7 @@
 {
     cfg->show_recent_number = (gint) gtk_adjustment_get_value(adj);
     DBG("Show %d recent documents", cfg->show_recent_number);
-    cfg->view_iface->update_menu(cfg->view_iface->places_view);
+    places_view_cfg_iface_update_menu(cfg->view_iface);
 }
 #endif
 
@@ -314,7 +314,7 @@
     g_assert(opt != NULL);
     *opt = gtk_toggle_button_get_active(toggle);
 
-    cfg->view_iface->update_menu(cfg->view_iface->places_view);
+    places_view_cfg_iface_update_menu(cfg->view_iface);
 }
 
 static void
@@ -324,8 +324,8 @@
     g_assert(opt != NULL);
     *opt = gtk_toggle_button_get_active(toggle);
 
-    cfg->view_iface->reconfigure_model(cfg->view_iface->places_view);
-    cfg->view_iface->update_menu(cfg->view_iface->places_view);
+    places_view_cfg_iface_reconfigure_model(cfg->view_iface);
+    places_view_cfg_iface_update_menu(cfg->view_iface);
 }
 
 static void
@@ -344,7 +344,7 @@
     GtkWidget *tmp_box, *tmp_label, *tmp_widget;
     gint active;
     
-    dlg = cfg->view_iface->make_empty_cfg_dialog(cfg->view_iface->places_view);
+    dlg = places_view_cfg_iface_make_empty_cfg_dialog(cfg->view_iface);
 
     /* BUTTON: frame, vbox */
     vbox_button = gtk_vbox_new(FALSE, 4);

Modified: xfce4-places-plugin/trunk/panel-plugin/view.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/view.c	2007-09-12 03:18:08 UTC (rev 3207)
+++ xfce4-places-plugin/trunk/panel-plugin/view.c	2007-09-12 03:32:09 UTC (rev 3208)
@@ -119,6 +119,32 @@
 static void     pview_destroy_menu(PlacesView*);
 static void     pview_button_update(PlacesView*);
 
+/********** Interface for Cfg's Use **********/
+
+inline void
+places_view_cfg_iface_update_menu(PlacesViewCfgIface *iface)
+{
+    iface->update_menu(iface->places_view);
+}
+
+inline void
+places_view_cfg_iface_update_button(PlacesViewCfgIface *iface)
+{
+    iface->update_button(iface->places_view);
+}
+
+inline void
+places_view_cfg_iface_reconfigure_model(PlacesViewCfgIface *iface)
+{
+    iface->reconfigure_model(iface->places_view);
+}
+
+inline GtkWidget*
+places_view_cfg_iface_make_empty_cfg_dialog(PlacesViewCfgIface *iface)
+{
+    return iface->make_empty_cfg_dialog(iface->places_view);
+}
+
 /********** Model Management **********/
 static void
 pview_reconfigure_model(PlacesView *view)
@@ -963,7 +989,6 @@
     
     view_cfg_iface                          = g_new0(PlacesViewCfgIface, 1);
     view_cfg_iface->places_view             = view;
-    view_cfg_iface->open_menu               = pview_open_menu;
     view_cfg_iface->update_menu             = pview_update_menu;
     view_cfg_iface->update_button           = pview_button_update;
     view_cfg_iface->reconfigure_model       = pview_reconfigure_model;

Modified: xfce4-places-plugin/trunk/panel-plugin/view.h
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/view.h	2007-09-12 03:18:08 UTC (rev 3207)
+++ xfce4-places-plugin/trunk/panel-plugin/view.h	2007-09-12 03:32:09 UTC (rev 3208)
@@ -36,7 +36,6 @@
     
     PlacesView          *places_view;
 
-    void                (*open_menu)                (PlacesView*);
     void                (*update_menu)              (PlacesView*);
     void                (*update_button)            (PlacesView*);
     void                (*reconfigure_model)        (PlacesView*);
@@ -44,6 +43,18 @@
     
 } PlacesViewCfgIface;
 
+inline void
+places_view_cfg_iface_update_menu(PlacesViewCfgIface*);
+
+inline void
+places_view_cfg_iface_update_button(PlacesViewCfgIface*);
+
+inline void
+places_view_cfg_iface_reconfigure_model(PlacesViewCfgIface*);
+
+inline GtkWidget*
+places_view_cfg_iface_make_empty_cfg_dialog(PlacesViewCfgIface*);
+
 #include "cfg.h"
 
 /* Init & Finalize */