Hello community,
here is the log from the commit of package gnome-main-menu for openSUSE:Factory
checked in at Sat Feb 7 00:16:05 CET 2009.
--------
--- GNOME/gnome-main-menu/gnome-main-menu.changes 2009-01-17 03:06:35.000000000 +0100
+++ gnome-main-menu/gnome-main-menu.changes 2009-01-29 13:55:51.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Jan 29 13:55:18 CET 2009 - vuntz@novell.com
+
+- Clean up BuildRequires and Requires of the devel package
+ (especially removing eel-devel).
+
+-------------------------------------------------------------------
+Sun Jan 25 01:51:06 CET 2009 - vuntz@novell.com
+
+- Call %suse_update_desktop_file on all desktop files. Part of
+ bnc#445728.
+- Add missing libglade2-devel BuildRequires.
+
+-------------------------------------------------------------------
@@ -7,0 +21,10 @@
+Mon Jan 12 15:25:27 EST 2009 - mauro@suse.de
+
+- Translations update.
+
+-------------------------------------------------------------------
+Wed Jan 07 00:08:25 CET 2009 - mboman@suse.de
+
+- Add gnome-main-menu-bgo551850.patch to fix building against 2.25.x
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
gnome-main-menu-bgo551850.patch
gnome-main-menu-no-X-SuSE-translate.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-main-menu.spec ++++++
--- /var/tmp/diff_new_pack.y28935/_old 2009-02-07 00:13:02.000000000 +0100
+++ /var/tmp/diff_new_pack.y28935/_new 2009-02-07 00:13:02.000000000 +0100
@@ -19,18 +19,19 @@
Name: gnome-main-menu
-BuildRequires: NetworkManager-devel fdupes gnome-common gnome-desktop-devel gnome-menus-devel gnome-panel-devel gnome-vfs2-devel gtk-doc intltool libgnomeui-devel libgtop-devel librsvg-devel nautilus-devel scrollkeeper update-desktop-files wireless-tools
-%if %suse_version < 1020
-BuildRequires: NetworkManager-gnome
-%endif
+BuildRequires: NetworkManager-devel fdupes gnome-common gnome-desktop-devel gnome-menus-devel gnome-panel-devel gtk-doc intltool libglade2-devel libgnomeui-devel libgtop-devel librsvg-devel nautilus-devel scrollkeeper update-desktop-files wireless-tools
License: GPL v2 or later
Group: System/GUI/GNOME
AutoReqProv: on
Version: 0.9.12
-Release: 6
+Release: 8
Summary: The GNOME Desktop Menu
Source: %{name}-%{version}.tar.bz2
Source4: %{name}-po.tar.gz
+# # PATCH-FIX-UPSTREAM gnome-main-menu-bgo551850.patch bgo551850 mboman@suse.de -- Fix up code to compile with GNOME 2.25.x
+Patch0: gnome-main-menu-bgo551850.patch
+# PATCH-FIX-UPSTREAM gnome-main-menu-no-X-SuSE-translate.patch vuntz@novell.com -- Remove X-SuSE-translate from desktop file
+Patch1: gnome-main-menu-no-X-SuSE-translate.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: gnome-panel dbus-1-glib hal tango-icon-theme wireless-tools
@@ -58,8 +59,11 @@
Summary: The GNOME Desktop Menu
Group: System/GUI/GNOME
AutoReqProv: on
-Requires: %{name} = %{version} gtk2-devel libgnomeui-devel libbonoboui-devel libglade2-devel librsvg-devel
-Requires: eel-devel gnome-desktop-devel gnome-menus-devel glib2-devel pango-devel
+Requires: %{name} = %{version} gtk2-devel libbonobo-devel
+Requires: gnome-desktop-devel glib2-devel
+# we need this because librsvg is in Requires.private of libslab, and
+# pkg-config checks for it :/ bfo#4738
+Requires: librsvg-devel
%description devel
The GNOME Desktop Menu and Application Browser.
@@ -90,6 +94,8 @@
%lang_package
%prep
%setup -n gnome-main-menu-%{version} -a4
+%patch0 -p1
+%patch1 -p1
%build
autoreconf -f -i
@@ -103,6 +109,8 @@
%install
%makeinstall
+%suse_update_desktop_file application-browser
+%suse_update_desktop_file gnome-screensaver-lock
%suse_update_desktop_file gnome-session-logout
%suse_update_desktop_file gnome-session-shutdown
%suse_update_desktop_file trigger-panel-run-dialog
@@ -166,9 +174,20 @@
%{_prefix}/%{_lib}/nautilus/extensions-1.0/*.la
%changelog
+* Thu Jan 29 2009 vuntz@novell.com
+- Clean up BuildRequires and Requires of the devel package
+ (especially removing eel-devel).
+* Sun Jan 25 2009 vuntz@novell.com
+- Call %%suse_update_desktop_file on all desktop files. Part of
+ bnc#445728.
+- Add missing libglade2-devel BuildRequires.
* Sat Jan 17 2009 crrodriguez@suse.de
- remove "la" files, baby step to clean up all references
to libavahi-*.la
+* Mon Jan 12 2009 mauro@suse.de
+- Translations update.
+* Wed Jan 07 2009 mboman@suse.de
+- Add gnome-main-menu-bgo551850.patch to fix building against 2.25.x
* Tue Jan 06 2009 sreeves@suse.de
- Update to 0.9.12
Fix BNC#447550 - translations not updating
++++++ gnome-main-menu-bgo551850.patch ++++++
diff --git a/application-browser/src/application-browser.c b/application-browser/src/application-browser.c
index 20dc22f..df5c5ee 100644
--- a/application-browser/src/application-browser.c
+++ b/application-browser/src/application-browser.c
@@ -23,14 +23,6 @@
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
#include
#include
#include
diff --git a/libslab/app-resizer.c b/libslab/app-resizer.c
index 6bb706b..44f7b02 100644
--- a/libslab/app-resizer.c
+++ b/libslab/app-resizer.c
@@ -18,12 +18,7 @@
* Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include
-#include
-#include
-#include
-#include
-#include
+#include
#include
#include "app-shell.h"
diff --git a/libslab/app-resizer.h b/libslab/app-resizer.h
index 3615f3e..b84cfb9 100644
--- a/libslab/app-resizer.h
+++ b/libslab/app-resizer.h
@@ -22,9 +22,7 @@
#define __APP_RESIZER_H__
#include
-#include
-#include
-#include
+#include
G_BEGIN_DECLS
diff --git a/libslab/app-shell.h b/libslab/app-shell.h
index c428456..2add230 100644
--- a/libslab/app-shell.h
+++ b/libslab/app-shell.h
@@ -23,7 +23,6 @@
#include
#include
-#include
#define GMENU_I_KNOW_THIS_IS_UNSTABLE
#include
diff --git a/libslab/application-tile.c b/libslab/application-tile.c
index 0b5b97f..5f1f5a2 100644
--- a/libslab/application-tile.c
+++ b/libslab/application-tile.c
@@ -21,8 +21,8 @@
#include "application-tile.h"
#include
+#include
#include
-#include
#include
#include
#include
diff --git a/libslab/search-bar.h b/libslab/search-bar.h
index 5c8e41d..35a3a77 100644
--- a/libslab/search-bar.h
+++ b/libslab/search-bar.h
@@ -21,8 +21,7 @@
#ifndef __NLD_SEARCH_BAR_H__
#define __NLD_SEARCH_BAR_H__
-#include
-#include
+#include
G_BEGIN_DECLS
diff --git a/libslab/search-context-picker.c b/libslab/search-context-picker.c
index 6b1e655..449c629 100644
--- a/libslab/search-context-picker.c
+++ b/libslab/search-context-picker.c
@@ -20,13 +20,7 @@
#include "search-context-picker.h"
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include
typedef struct
{
diff --git a/libslab/search-context-picker.h b/libslab/search-context-picker.h
index 6a6b632..fb1411e 100644
--- a/libslab/search-context-picker.h
+++ b/libslab/search-context-picker.h
@@ -21,7 +21,7 @@
#ifndef __NLD_SEARCH_CONTEXT_PICKER_H__
#define __NLD_SEARCH_CONTEXT_PICKER_H__
-#include
+#include
G_BEGIN_DECLS
diff --git a/main-menu/src/eggaccelerators.h b/main-menu/src/eggaccelerators.h
index 27f38b2..e63d6a1 100644
--- a/main-menu/src/eggaccelerators.h
+++ b/main-menu/src/eggaccelerators.h
@@ -41,7 +41,7 @@
#ifndef __EGG_ACCELERATORS_H__
#define __EGG_ACCELERATORS_H__
-#include
+#include
#include
G_BEGIN_DECLS
diff --git a/main-menu/src/hard-drive-status-tile.c b/main-menu/src/hard-drive-status-tile.c
index 89f828b..f39c275 100644
--- a/main-menu/src/hard-drive-status-tile.c
+++ b/main-menu/src/hard-drive-status-tile.c
@@ -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);
}
diff --git a/main-menu/src/tomboykeybinder.c b/main-menu/src/tomboykeybinder.c
index 9066fd8..7ed4da1 100644
--- a/main-menu/src/tomboykeybinder.c
+++ b/main-menu/src/tomboykeybinder.c
@@ -19,7 +19,6 @@
*/
#include
-#include
#include
#include
#include
diff --git a/nautilus-main-menu/nautilus-main-menu.c b/nautilus-main-menu/nautilus-main-menu.c
index cb1b017..ac684ba 100644
--- a/nautilus-main-menu/nautilus-main-menu.c
+++ b/nautilus-main-menu/nautilus-main-menu.c
@@ -31,7 +31,6 @@
#include
#include
-#include
#include /* for strcmp */
#include /* 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 */
diff --git a/application-browser/src/application-browser.c b/application-browser/src/application-browser.c
index df5c5ee..afb012d 100644
--- a/application-browser/src/application-browser.c
+++ b/application-browser/src/application-browser.c
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include "app-shell.h"
#include "app-shell-startup.h"
diff --git a/libslab/app-shell.c b/libslab/app-shell.c
index ceaa956..3d87bb2 100644
--- a/libslab/app-shell.c
+++ b/libslab/app-shell.c
@@ -25,8 +25,11 @@
#include
#include
#include
+#include
#include
#include
+#include
+#include
#include
@@ -648,14 +651,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);
diff --git a/libslab/application-tile.c b/libslab/application-tile.c
index 5f1f5a2..2376d10 100644
--- a/libslab/application-tile.c
+++ b/libslab/application-tile.c
@@ -344,12 +344,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);
diff --git a/libslab/directory-tile.c b/libslab/directory-tile.c
index 8964c17..3bd3dc5 100644
--- a/libslab/directory-tile.c
+++ b/libslab/directory-tile.c
@@ -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)
diff --git a/libslab/document-tile.c b/libslab/document-tile.c
index 54a8bc0..33522a7 100644
--- a/libslab/document-tile.c
+++ b/libslab/document-tile.c
@@ -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)
diff --git a/libslab/nameplate-tile.c b/libslab/nameplate-tile.c
index fc2f661..3ea5f3e 100644
--- a/libslab/nameplate-tile.c
+++ b/libslab/nameplate-tile.c
@@ -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;
}
diff --git a/main-menu/src/main-menu-ui.c b/main-menu/src/main-menu-ui.c
index 69bc278..b056dc3 100644
--- a/main-menu/src/main-menu-ui.c
+++ b/main-menu/src/main-menu-ui.c
@@ -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:
diff --git a/main-menu/src/main-menu.c b/main-menu/src/main-menu.c
index 0c669da..3def5a3 100644
--- a/main-menu/src/main-menu.c
+++ b/main-menu/src/main-menu.c
@@ -24,6 +24,7 @@
#include
#include
+#include
#include
#include "libslab-utils.h"
++++++ gnome-main-menu-no-X-SuSE-translate.patch ++++++
Index: gnome-main-menu-0.9.11/application-browser/etc/application-browser.desktop.in.in
===================================================================
--- gnome-main-menu-0.9.11.orig/application-browser/etc/application-browser.desktop.in.in
+++ gnome-main-menu-0.9.11/application-browser/etc/application-browser.desktop.in.in
@@ -1,5 +1,4 @@
[Desktop Entry]
-X-SuSE-translate=true
_Name=Application Browser
Exec=@BINDIR@/application-browser
Terminal=false
++++++ gnome-main-menu-po.tar.gz ++++++
++++ 2737 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org