Commit a08e5a39 authored by Magnus Boman's avatar Magnus Boman

Fix build against GNOME 2.25.x

svn path=/trunk/; revision=549
parent 4ec6b659
2009-01-07 Magnus Boman <captain.magnus@gmail.com>
reviewed by: Magnus Boman
* application-browser/src/application-browser.c:
* main-menu/src/eggaccelerators.h:
* main-menu/src/hard-drive-status-tile.c
(hard_drive_status_tile_finalize):
* main-menu/src/main-menu-ui.c (main_menu_ui_finalize),
(create_panel_button), (panel_applet_change_background_cb):
* main-menu/src/main-menu.c:
* main-menu/src/tomboykeybinder.c:
* nautilus-main-menu/nautilus-main-menu.c (get_menu_file_info),
(main_menu_callback):
- Use single GTK inclues - Fix bgo#551850#c2
Patch by Cosimo Cecchi
- Compile with G*_DISABLE_DEPRECATED - Fixes bgo#551850#c3
Patch by Cosimo Cecchi
- Directly include libgnomeui.h to build against new gnome-panel
2009-01-06 Scott Reeves <sreeves@novell.com>
* configure.in: post release bump to 0.9.13
......
......@@ -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"
......
2009-01-07 Magnus Boman <mboman@mblxsrv01>
reviewed by: <delete if not using a buddy>
* app-resizer.c:
* app-resizer.h:
* app-shell.c (delete_old_data):
* app-shell.h:
* application-tile.c (application_tile_setup):
* directory-tile.c (directory_tile_new):
* document-tile.c (document_tile_new):
* nameplate-tile.c (nameplate_tile_class_init),
(nameplate_tile_get_property), (nameplate_tile_set_property):
* search-bar.h:
* search-context-picker.c:
* search-context-picker.h:
==================== 0.9.12 ====================
2008-11-06 Federico Mena Quintero <federico@novell.com>
......
......@@ -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"
......
......@@ -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
......
......@@ -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 @@ delete_old_data (AppShellData * app_data)
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);
......
......@@ -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>
......
......@@ -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 @@ application_tile_setup (ApplicationTile *this, const gchar *gconf_prefix)
"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);
......
......@@ -145,9 +145,9 @@ directory_tile_new (const gchar *in_uri, const gchar *title, const gchar *icon_n
"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)
......
......@@ -166,7 +166,8 @@ document_tile_new (const gchar *in_uri, const gchar *mime_type, time_t modified)
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)
......
......@@ -46,7 +46,6 @@ enum
PROP_NAMEPLATE_IMAGE,
PROP_NAMEPLATE_HEADER,
PROP_NAMEPLATE_SUBHEADER,
PROP_NAMEPLATE_TOOLTIP
};
G_DEFINE_TYPE (NameplateTile, nameplate_tile, TILE_TYPE)
......@@ -89,11 +88,6 @@ nameplate_tile_class_init (NameplateTileClass * this_class)
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 @@ nameplate_tile_get_property (GObject * g_object, guint prop_id, GValue * value,
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 @@ nameplate_tile_set_property (GObject * g_object, guint prop_id, const GValue * v
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 @@ nameplate_tile_set_property (GObject * g_object, guint prop_id, const GValue * v
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 @@ nameplate_tile_set_property (GObject * g_object, guint prop_id, const GValue * v
break;
case PROP_NAMEPLATE_TOOLTIP:
gtk_widget_set_tooltip_text (GTK_WIDGET (this), tooltip);
break;
default:
break;
}
......
......@@ -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
......
......@@ -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
{
......
......@@ -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
......
......@@ -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
......
......@@ -148,7 +148,10 @@ hard_drive_status_tile_init (HardDriveStatusTile * tile)
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);
}
......
......@@ -441,7 +441,7 @@ main_menu_ui_finalize (GObject *g_obj)
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 @@ create_panel_button (MainMenuUI *this)
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 @@ panel_applet_change_background_cb (PanelApplet *applet, PanelAppletBackgroundTyp
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:
......
......@@ -24,6 +24,7 @@
#include <glib.h>
#include <panel-applet.h>
#include <libgnomeui/libgnomeui.h>
#include <string.h>
#include "libslab-utils.h"
......
......@@ -19,7 +19,6 @@
*/
#include <gdk/gdk.h>
#include <gdk/gdkwindow.h>
#include <gdk/gdkx.h>
#include <string.h>
#include <X11/Xlib.h>
......
......@@ -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 @@ get_menu_file_info (NautilusFileInfo *file_info)
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 @@ static void
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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment