[Antiright-devel] antiright/gtkshell ptk-app-menu.c

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 10/08/16 09:38:12

Modified files:
        gtkshell       : ptk-app-menu.c 

Log message:
        Fix application menu layout with -or 1 once again.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/ptk-app-menu.c?cvsroot=antiright&r1=1.5&r2=1.6

Patches:
Index: ptk-app-menu.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/ptk-app-menu.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ptk-app-menu.c      15 Aug 2010 22:23:29 -0000      1.5
+++ ptk-app-menu.c      16 Aug 2010 09:38:12 -0000      1.6
@@ -667,6 +667,24 @@
        }
 }
 
+static void
+check_path(const int i)
+{
+       char * path;
+       struct stat dir_stat;
+
+        path = g_build_filename( sys_dirs[i], app_dir_name, NULL );
+        if( stat( path, &dir_stat) == 0 )
+        {
+            if( times[i] != dir_stat.st_mtime )
+            {
+                g_free( path );
+                return TRUE;
+            }
+        }
+        g_free( path );
+}
+
 bool ptk_app_menu_need_reload( GtkWidget* menu )
 {
     const char** sys_dirs = (const char**)g_get_system_data_dirs();
@@ -713,19 +731,6 @@
                gtk_image_new_from_stock("gtk-home", gsh->icon_size));
 }
 
-static void
-manage_app_menu(GSH * gsh, GtkWidget * menu_bar)
-{
-       GtkWidget * hbox;
-       guint * current_row = &(gsh->rows->current);
-       
-       GSH_ADD_MANAGED(gsh, hbox, hbox, TRUE, 0);
-       (*current_row)++;
-       gtk_container_set_border_width(GTK_CONTAINER(hbox), 0);
-       GSHCA(hbox, menu_bar);
-       (*current_row)++;
-}
-
 static GtkWidget *
 setup_menu_bar(GtkWidget * menu_button_item)
 {
@@ -754,9 +759,8 @@
 void
 gsh_add_app_menu_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
-       manage_app_menu(gsh, 
-               setup_menu_bar(
-                       setup_menu_button_item(gsh, 
-                               ptk_app_menu_new())));
+       gsh->rows->current++;
+       $(gsh, manage, setup_menu_bar(
+               setup_menu_button_item(gsh, ptk_app_menu_new())));
 }