15800N/AIndex: trunk/configure.in
15800N/A===================================================================
15800N/A--- trunk/configure.in (revision 552)
15800N/A+++ trunk/configure.in (working copy)
15800N/A@@ -103,7 +103,7 @@
15800N/A AC_SUBST(LIBGLADE_CFLAGS)
15800N/A AC_SUBST(LIBGLADE_LIBS)
15800N/A
15800N/A-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0)
15800N/A+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.15.0)
15800N/A AC_SUBST(GTK_CFLAGS)
15800N/A AC_SUBST(GTK_LIBS)
15800N/A
15800N/AIndex: trunk/pm/ospm-queue-manager.c
15800N/A===================================================================
15800N/A--- trunk/pm/ospm-queue-manager.c (revision 552)
15800N/A+++ trunk/pm/ospm-queue-manager.c (working copy)
15800N/A@@ -151,8 +151,6 @@
15800N/A static void build_printer_popup_menu (OspmQueueManager *qm);
15800N/A static void update_printer_popup_menu (OspmQueueManager *qm);
15800N/A static void build_background_popup_menu (OspmQueueManager *qm);
15800N/A-static const gchar *gtk_menu_item_get_label (GtkMenuItem *menu_item);
15800N/A-
15800N/A static void pop_up_context_menu (GtkMenu *menu,
15800N/A gint16 offset_x,
15800N/A gint16 offset_y,
15800N/A@@ -793,23 +791,6 @@
15800N/A
15800N/A }
15800N/A
15800N/A-static const gchar *
15800N/A-gtk_menu_item_get_label (GtkMenuItem *menu_item)
15800N/A-{
15800N/A- GList *children, *l;
15800N/A- GtkWidget *child;
15800N/A-
15800N/A- children = gtk_container_get_children (GTK_CONTAINER (menu_item));
15800N/A-
15800N/A- for (l = g_list_first (children); l != NULL; l = g_list_next (l)) {
15800N/A- child = (GtkWidget *)l->data;
15800N/A- if (GTK_IS_LABEL (child)) {
15800N/A- return gtk_label_get_label (GTK_LABEL (child));
15800N/A- }
15800N/A- }
15800N/A-
15800N/A-}
15800N/A-
15800N/A void
15800N/A ospm_check_group_list_popup_sensitivity (GtkMenuItem *menu_item,
15800N/A const gchar *name)
15800N/A@@ -828,8 +809,10 @@
15800N/A for (l = g_list_first (children); l != NULL; l = g_list_next (l)) {
15800N/A child = (GtkWidget *)l->data;
15800N/A gname = gtk_menu_item_get_label (GTK_MENU_ITEM (child));
15800N/A- if (!gname)
15800N/A+ /* Check validation and seperator */
15800N/A+ if (!gname || g_str_equal (gname, "")) {
15800N/A continue;
15800N/A+ }
15800N/A if (g_str_equal (gname, name)) {
15800N/A gtk_widget_set_sensitive (child, FALSE);
15800N/A } else {