Author: rpmcruz
Date: Thu Feb 25 17:18:24 2010
New Revision: 61027
URL: http://svn.opensuse.org/viewcvs/yast?rev=61027&view=rev
Log:
* src/YGUtils.cc: bug fix 582536 and 582560. map jump-to to
ok icon. Don't map gtk-dialog- icons.
* src/YGUI.cc: backported bug fix 547261: work around broken
metacity icon by defaulting to the generic yast2 icon.
Modified:
branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog
branches/SuSE-Code-11-SP1-Branch/gtk/src/YGUI.cc
branches/SuSE-Code-11-SP1-Branch/gtk/src/YGUtils.cc
Modified: branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog?rev=61027&r1=61026&r2=61027&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog (original)
+++ branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog Thu Feb 25 17:18:24 2010
@@ -1,3 +1,11 @@
+2010-02-25 Ricardo Cruz
+
+ * src/YGUtils.cc: bug fix 582536 and 582560. map jump-to to
+ ok icon. Don't map gtk-dialog- icons.
+
+ * src/YGUI.cc: backported bug fix 547261: work around broken
+ metacity icon by defaulting to the generic yast2 icon.
+
2010-02-24 Ricardo Cruz
* src/YGUtils.cc: use remove icon instead of clear,
Modified: branches/SuSE-Code-11-SP1-Branch/gtk/src/YGUI.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/src/YGUI.cc?rev=61027&r1=61026&r2=61027&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/gtk/src/YGUI.cc (original)
+++ branches/SuSE-Code-11-SP1-Branch/gtk/src/YGUI.cc Thu Feb 25 17:18:24 2010
@@ -141,6 +141,12 @@
g_log_set_always_fatal (GLogLevelFlags (G_LOG_LEVEL_ERROR|G_LOG_LEVEL_CRITICAL|
G_LOG_LEVEL_WARNING| G_LOG_LEVEL_MESSAGE|G_LOG_LEVEL_INFO|G_LOG_LEVEL_DEBUG));
#endif
+
+ GdkPixbuf *pixbuf = YGUtils::loadPixbuf (THEMEDIR "/icons/32x32/apps/yast.png");
+ if (pixbuf) { // default window icon
+ gtk_window_set_default_icon (pixbuf);
+ g_object_unref (G_OBJECT (pixbuf));
+ }
}
static gboolean ycp_wakeup_fn (GIOChannel *source, GIOCondition condition,
Modified: branches/SuSE-Code-11-SP1-Branch/gtk/src/YGUtils.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/src/YGUtils.cc?rev=61027&r1=61026&r2=61027&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/gtk/src/YGUtils.cc (original)
+++ branches/SuSE-Code-11-SP1-Branch/gtk/src/YGUtils.cc Thu Feb 25 17:18:24 2010
@@ -584,7 +584,13 @@
_id = GTK_STOCK_DELETE;
else if (!strcmp (id, GTK_STOCK_QUIT))
_id = GTK_STOCK_APPLY;
- stockMap[cutUnderline (item.label)] = _id;
+ else if (!strcmp (id, GTK_STOCK_JUMP_TO))
+ _id = GTK_STOCK_OK;
+ else if (!strncmp (id, "gtk-dialog-", 11))
+ _id = 0;
+
+ if (_id)
+ stockMap[cutUnderline (item.label)] = _id;
}
// some may not have a stock item because they can't be set on a label
// e.g.: gtk-directory, gtk-missing-image, gtk-dnd
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
