GNOME.org
 

gnome-main-menu r549 - in trunk: . application-browser/src libslab main-menu/src nautilus-main-menu

Author: mboman
Date: Wed Jan  7 01:37:13 2009
New Revision: 549
URL: http://svn.gnome.org/viewvc/gnome-main-menu?rev=549&view=rev

Log:
Fix build against GNOME 2.25.x

Modified:
   trunk/ChangeLog
   trunk/application-browser/src/application-browser.c
   trunk/libslab/ChangeLog
   trunk/libslab/app-resizer.c
   trunk/libslab/app-resizer.h
   trunk/libslab/app-shell.c
   trunk/libslab/app-shell.h
   trunk/libslab/application-tile.c
   trunk/libslab/directory-tile.c
   trunk/libslab/document-tile.c
   trunk/libslab/nameplate-tile.c
   trunk/libslab/search-bar.h
   trunk/libslab/search-context-picker.c
   trunk/libslab/search-context-picker.h
   trunk/main-menu/src/eggaccelerators.h
   trunk/main-menu/src/hard-drive-status-tile.c
   trunk/main-menu/src/main-menu-ui.c
   trunk/main-menu/src/main-menu.c
   trunk/main-menu/src/tomboykeybinder.c
   trunk/nautilus-main-menu/nautilus-main-menu.c

Modified: trunk/application-browser/src/application-browser.c
==============================================================================
--- trunk/application-browser/src/application-browser.c	(original)
+++ trunk/application-browser/src/application-browser.c	Wed Jan  7 01:37:13 2009
@@ -23,18 +23,11 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkentry.h>
 #include <panel-applet.h>
 #include <libgnome/gnome-desktop-item.h>
 #include <libgnomeui/libgnomeui.h>
 #include <dirent.h>
+#include <stdlib.h>
 
 #include "app-shell.h"
 #include "app-shell-startup.h"

Modified: trunk/libslab/app-resizer.c
==============================================================================
--- trunk/libslab/app-resizer.c	(original)
+++ trunk/libslab/app-resizer.c	Wed Jan  7 01:37:13 2009
@@ -18,12 +18,7 @@
  * Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtklist.h>
-#include <gtk/gtklayout.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-desktop-item.h>
 
 #include "app-shell.h"

Modified: trunk/libslab/app-resizer.h
==============================================================================
--- trunk/libslab/app-resizer.h	(original)
+++ trunk/libslab/app-resizer.h	Wed Jan  7 01:37:13 2009
@@ -22,9 +22,7 @@
 #define __APP_RESIZER_H__
 
 #include <glib.h>
-#include <gtk/gtklayout.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libslab/app-shell.c
==============================================================================
--- trunk/libslab/app-shell.c	(original)
+++ trunk/libslab/app-shell.c	Wed Jan  7 01:37:13 2009
@@ -25,8 +25,11 @@
 #include <libgnome/gnome-desktop-item.h>
 #include <libgnomeui/libgnomeui.h>
 #include <gio/gio.h>
+#include <gdk/gdkkeysyms.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <string.h>
+#include <stdlib.h>
 
 #include <glib/gi18n-lib.h>
 
@@ -649,14 +652,14 @@
 		CategoryData *data = (CategoryData *) cat_list->data;
 		gtk_widget_destroy (GTK_WIDGET (data->section));
 		gtk_widget_destroy (GTK_WIDGET (data->group_launcher));
-		gtk_object_unref (GTK_OBJECT (data->section));
-		gtk_object_unref (GTK_OBJECT (data->group_launcher));
+		g_object_unref (data->section);
+		g_object_unref (data->group_launcher);
 		g_free (data->category);
 
 		for (temp = data->launcher_list; temp; temp = g_list_next (temp))
 		{
 			g_free (g_object_get_data (G_OBJECT (temp->data), TILE_EXEC_NAME));
-			gtk_object_unref (temp->data);
+			g_object_unref (temp->data);
 		}
 
 		g_list_free (data->launcher_list);

Modified: trunk/libslab/app-shell.h
==============================================================================
--- trunk/libslab/app-shell.h	(original)
+++ trunk/libslab/app-shell.h	Wed Jan  7 01:37:13 2009
@@ -23,7 +23,6 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkeventbox.h>
 #define GMENU_I_KNOW_THIS_IS_UNSTABLE
 #include <gmenu-tree.h>
 

Modified: trunk/libslab/application-tile.c
==============================================================================
--- trunk/libslab/application-tile.c	(original)
+++ trunk/libslab/application-tile.c	Wed Jan  7 01:37:13 2009
@@ -21,8 +21,8 @@
 #include "application-tile.h"
 
 #include <string.h>
+#include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gfileutils.h>
 #include <glib/gstdio.h>
 #include <gconf/gconf-client.h>
 #include <unistd.h>
@@ -345,12 +345,12 @@
 		"nameplate-image",         image,
 		"nameplate-header",        header,
 		"nameplate-subheader",     subheader,
-		"nameplate-tooltip",	   comment,
 		"context-menu",            context_menu,
 		"application-name",        name,
 		"application-description", desc,
 		"gconf-prefix",            gconf_prefix,
 		NULL);
+	gtk_widget_set_tooltip_text (GTK_WIDGET (this), comment);
 
 	priv->agent = bookmark_agent_get_instance (BOOKMARK_STORE_USER_APPS);
 	g_object_get (G_OBJECT (priv->agent), BOOKMARK_AGENT_STORE_STATUS_PROP, & priv->agent_status, NULL);

Modified: trunk/libslab/directory-tile.c
==============================================================================
--- trunk/libslab/directory-tile.c	(original)
+++ trunk/libslab/directory-tile.c	Wed Jan  7 01:37:13 2009
@@ -145,9 +145,9 @@
 		"tile-uri",          uri,
 		"nameplate-image",   image,
 		"nameplate-header",  header,
-		"nameplate-tooltip", tooltip_text,
 		"context-menu",      context_menu,
 		NULL);
+	gtk_widget_set_tooltip_text (GTK_WIDGET (this), tooltip_text);
 
 	g_free (uri);
 	if (tooltip_text)

Modified: trunk/libslab/document-tile.c
==============================================================================
--- trunk/libslab/document-tile.c	(original)
+++ trunk/libslab/document-tile.c	Wed Jan  7 01:37:13 2009
@@ -166,7 +166,8 @@
 
 	this = g_object_new (DOCUMENT_TILE_TYPE, "tile-uri", uri, "nameplate-image", image,
 		"nameplate-header", header, "nameplate-subheader", subheader, 
-		"nameplate-tooltip", tooltip_text, "context-menu", context_menu, NULL);
+		"context-menu", context_menu, NULL);
+	gtk_widget_set_tooltip_text (GTK_WIDGET (this), tooltip_text);
 
 	g_free (uri);
 	if (tooltip_text)

Modified: trunk/libslab/nameplate-tile.c
==============================================================================
--- trunk/libslab/nameplate-tile.c	(original)
+++ trunk/libslab/nameplate-tile.c	Wed Jan  7 01:37:13 2009
@@ -46,7 +46,6 @@
 	PROP_NAMEPLATE_IMAGE,
 	PROP_NAMEPLATE_HEADER,
 	PROP_NAMEPLATE_SUBHEADER,
-	PROP_NAMEPLATE_TOOLTIP
 };
 
 G_DEFINE_TYPE (NameplateTile, nameplate_tile, TILE_TYPE)
@@ -89,11 +88,6 @@
 	g_object_class_install_property (g_obj_class, PROP_NAMEPLATE_SUBHEADER,
 		g_param_spec_object ("nameplate-subheader", "nameplate-subheader",
 			"nameplate subheader", GTK_TYPE_WIDGET, G_PARAM_READWRITE));
-
-	g_object_class_install_property (g_obj_class, PROP_NAMEPLATE_TOOLTIP,
-		g_param_spec_string ("nameplate-tooltip", "nameplate-tooltip",
-			"nameplate tooltip", NULL, G_PARAM_READWRITE));
-
 }
 
 static void
@@ -144,12 +138,6 @@
 	case PROP_NAMEPLATE_SUBHEADER:
 		g_value_set_object (value, np_tile->subheader);
 		break;
-	case PROP_NAMEPLATE_TOOLTIP:
-		tooltip = gtk_widget_get_tooltip_text (GTK_WIDGET (np_tile));
-		g_value_set_string (value, tooltip);
-		g_free (tooltip);
-		break;
-
 	default:
 		break;
 	}
@@ -163,7 +151,6 @@
 	NameplateTilePrivate *priv = NAMEPLATE_TILE_GET_PRIVATE (this);
 
 	GObject *widget_obj = NULL;
-	const gchar *tooltip = NULL;
 
 	switch (prop_id) {
 		case PROP_NAMEPLATE_IMAGE:
@@ -171,11 +158,6 @@
 		case PROP_NAMEPLATE_SUBHEADER:
 			widget_obj = g_value_get_object (value);
 			break;
-
-		case PROP_NAMEPLATE_TOOLTIP:
-			tooltip = g_value_get_string (value);
-			break;
-
 		default:
 			break;
 	}
@@ -233,11 +215,6 @@
 
 		break;
 
-	case PROP_NAMEPLATE_TOOLTIP:
-		gtk_widget_set_tooltip_text (GTK_WIDGET (this), tooltip);
-		break;
-
-
 	default:
 		break;
 	}

Modified: trunk/libslab/search-bar.h
==============================================================================
--- trunk/libslab/search-bar.h	(original)
+++ trunk/libslab/search-bar.h	Wed Jan  7 01:37:13 2009
@@ -21,8 +21,7 @@
 #ifndef __NLD_SEARCH_BAR_H__
 #define __NLD_SEARCH_BAR_H__
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libslab/search-context-picker.c
==============================================================================
--- trunk/libslab/search-context-picker.c	(original)
+++ trunk/libslab/search-context-picker.c	Wed Jan  7 01:37:13 2009
@@ -20,13 +20,7 @@
 
 #include "search-context-picker.h"
 
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkvseparator.h>
+#include <gtk/gtk.h>
 
 typedef struct
 {

Modified: trunk/libslab/search-context-picker.h
==============================================================================
--- trunk/libslab/search-context-picker.h	(original)
+++ trunk/libslab/search-context-picker.h	Wed Jan  7 01:37:13 2009
@@ -21,7 +21,7 @@
 #ifndef __NLD_SEARCH_CONTEXT_PICKER_H__
 #define __NLD_SEARCH_CONTEXT_PICKER_H__
 
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/main-menu/src/eggaccelerators.h
==============================================================================
--- trunk/main-menu/src/eggaccelerators.h	(original)
+++ trunk/main-menu/src/eggaccelerators.h	Wed Jan  7 01:37:13 2009
@@ -41,7 +41,7 @@
 #ifndef __EGG_ACCELERATORS_H__
 #define __EGG_ACCELERATORS_H__
 
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS

Modified: trunk/main-menu/src/hard-drive-status-tile.c
==============================================================================
--- trunk/main-menu/src/hard-drive-status-tile.c	(original)
+++ trunk/main-menu/src/hard-drive-status-tile.c	Wed Jan  7 01:37:13 2009
@@ -148,7 +148,10 @@
 static void
 hard_drive_status_tile_finalize (GObject * g_object)
 {
-	/* FIXME */
+	HardDriveStatusTilePrivate *priv = HARD_DRIVE_STATUS_TILE_GET_PRIVATE (HARD_DRIVE_STATUS_TILE (g_object));
+
+	g_object_unref (priv->gconf);
+
 	(*G_OBJECT_CLASS (hard_drive_status_tile_parent_class)->finalize) (g_object);
 }
 

Modified: trunk/main-menu/src/main-menu-ui.c
==============================================================================
--- trunk/main-menu/src/main-menu-ui.c	(original)
+++ trunk/main-menu/src/main-menu-ui.c	Wed Jan  7 01:37:13 2009
@@ -441,7 +441,7 @@
 		g_object_unref (G_OBJECT (g_object_get_data (
 			G_OBJECT (priv->panel_buttons [i]), "double-click-detector")));
 
-		gtk_widget_unref (GTK_WIDGET (priv->panel_buttons [i]));
+		g_object_unref (priv->panel_buttons [i]);
 	}
 
 	libslab_gconf_notify_remove (priv->search_cmd_gconf_mntr_id);
@@ -505,7 +505,7 @@
 
 		button_parent = gtk_widget_get_parent (GTK_WIDGET (priv->panel_buttons [i]));
 
-		gtk_widget_ref (GTK_WIDGET (priv->panel_buttons [i]));
+		g_object_ref (priv->panel_buttons [i]);
 		gtk_container_remove (
 			GTK_CONTAINER (button_parent), GTK_WIDGET (priv->panel_buttons [i]));
 
@@ -2428,7 +2428,7 @@
 	gtk_widget_set_style (GTK_WIDGET (priv->panel_applet), NULL);
 	rc_style = gtk_rc_style_new ();
 	gtk_widget_modify_style (GTK_WIDGET (priv->panel_applet), rc_style);
-	gtk_rc_style_unref (rc_style);
+	g_object_unref (rc_style);
 
 	switch (type) {
 		case PANEL_NO_BACKGROUND:

Modified: trunk/main-menu/src/main-menu.c
==============================================================================
--- trunk/main-menu/src/main-menu.c	(original)
+++ trunk/main-menu/src/main-menu.c	Wed Jan  7 01:37:13 2009
@@ -24,6 +24,7 @@
 
 #include <glib.h>
 #include <panel-applet.h>
+#include <libgnomeui/libgnomeui.h>
 #include <string.h>
 
 #include "libslab-utils.h"

Modified: trunk/main-menu/src/tomboykeybinder.c
==============================================================================
--- trunk/main-menu/src/tomboykeybinder.c	(original)
+++ trunk/main-menu/src/tomboykeybinder.c	Wed Jan  7 01:37:13 2009
@@ -19,7 +19,6 @@
  */
 
 #include <gdk/gdk.h>
-#include <gdk/gdkwindow.h>
 #include <gdk/gdkx.h>
 #include <string.h>
 #include <X11/Xlib.h>

Modified: trunk/nautilus-main-menu/nautilus-main-menu.c
==============================================================================
--- trunk/nautilus-main-menu/nautilus-main-menu.c	(original)
+++ trunk/nautilus-main-menu/nautilus-main-menu.c	Wed Jan  7 01:37:13 2009
@@ -31,7 +31,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#include <gconf/gconf-client.h>
 
 #include <string.h> /* for strcmp */
 #include <unistd.h> /* for chdir */
@@ -63,7 +62,6 @@
 	g_assert (file_info);
 
 	mime_type = nautilus_file_info_get_mime_type (file_info);
-	g_print ("Checking mime type %s\n", mime_type);
 	
 	if (strcmp (mime_type, "application/x-desktop") == 0) {
 		ret = FILE_INFO_LAUNCHER;
@@ -89,10 +87,6 @@
 main_menu_callback (NautilusMenuItem *item,
 			NautilusFileInfo *file_info)
 {
-	static GConfClient *client;
-
-	client = gconf_client_get_default ();
-
 	switch (get_menu_file_info (file_info)) {
 		case FILE_INFO_LAUNCHER:
 			/* Add to the launcher favorites */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]