Hello community,
here is the log from the commit of package libyui-gtk for openSUSE:Factory
checked in at 2012-11-20 20:15:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-gtk (Old)
and /work/SRC/openSUSE:Factory/.libyui-gtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-gtk", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-gtk/libyui-gtk.changes 2012-09-11
09:11:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libyui-gtk.new/libyui-gtk.changes
2012-11-20 20:15:46.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Nov 2 19:19:27 CET 2012 - anase...@linux.it
+
+- Used YApplication::applicationTitle() and
+ YApplication::applicationIcon() to set title and icon
+- Reimplemented setApplicationTitle from YApplication
+- Fixed YAlignment::setBackgroundPixmap crash
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
libyui-gtk.spec: same change
++++++ libyui-gtk-2.42.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-2.42.1/ChangeLog
new/libyui-gtk-2.42.1/ChangeLog
--- old/libyui-gtk-2.42.1/ChangeLog 2012-09-07 12:37:09.000000000 +0200
+++ new/libyui-gtk-2.42.1/ChangeLog 2012-11-13 12:13:04.000000000 +0100
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Fri Nov 2 19:19:27 CET 2012 - anase...@linux.it
+
+- Used YApplication::applicationTitle() and
+ YApplication::applicationIcon() to set title and icon
+- Reimplemented setApplicationTitle from YApplication
+- Fixed YAlignment::setBackgroundPixmap crash
+
+-------------------------------------------------------------------
Tue Sep 4 14:35:20 CEST 2012 - tgoettlic...@suse.de
- Fixed requirements in doc spec file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-2.42.1/src/YGDialog.cc
new/libyui-gtk-2.42.1/src/YGDialog.cc
--- old/libyui-gtk-2.42.1/src/YGDialog.cc 2012-09-07 12:37:09.000000000
+0200
+++ new/libyui-gtk-2.42.1/src/YGDialog.cc 2012-11-13 12:13:04.000000000
+0100
@@ -91,7 +91,22 @@
atk_object_set_role (peer,
ATK_ROLE_DIALOG);
}
else {
- gtk_window_set_title (window, "YaST");
+#ifdef LIBYUI_VERSION_NUM
+ #if LIBYUI_VERSION_AT_LEAST(2,42,3)
+ gtk_window_set_title (window,
YUI::app()->applicationTitle().c_str());
+ GdkPixbuf *pixbuf =
YGUtils::loadPixbuf (YUI::app()->applicationIcon());
+ if (pixbuf) { // default
window icon
+
gtk_window_set_default_icon (pixbuf);
+ g_object_unref
(G_OBJECT (pixbuf));
+ }
+ #else
+ // to be back compatible
+ gtk_window_set_title (window,
"YaST");
+ #endif
+#else
+ // to be back compatible
+ gtk_window_set_title (window,
"YaST");
+#endif
if (YGUI::ui()->unsetBorder())
gtk_window_set_decorated (window, FALSE);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-2.42.1/src/YGLayout.cc
new/libyui-gtk-2.42.1/src/YGLayout.cc
--- old/libyui-gtk-2.42.1/src/YGLayout.cc 2012-09-07 12:37:09.000000000
+0200
+++ new/libyui-gtk-2.42.1/src/YGLayout.cc 2012-11-13 12:13:04.000000000
+0100
@@ -13,6 +13,7 @@
have to do any work. */
#include "ygtkfixed.h"
+#include "YGi18n.h"
static void doMoveChild (GtkWidget *fixed, YWidget *ychild, int x, int y)
{
@@ -152,7 +153,6 @@
YAlignment::setBackgroundPixmap (_filename);
// YAlignment will prepend a path to the image
std::string filename (YAlignment::backgroundPixmap());
-
if (m_background_pixbuf)
g_object_unref (G_OBJECT (m_background_pixbuf));
@@ -169,23 +169,23 @@
filename.c_str(), error->message);
else
g_signal_connect (G_OBJECT (getWidget()),
"draw",
- G_CALLBACK (draw_event_cb),
this);
+ G_CALLBACK
(YGAlignment::draw_event_cb), this);
}
}
- static gboolean draw_event_cb (GtkWidget *widget, cairo_t *cr, int
width, int height,
- YGAlignment *pThis)
- {
- gdk_cairo_set_source_pixbuf (cr, pThis->m_background_pixbuf, 0,
0);
- cairo_pattern_set_extend (cairo_get_source (cr),
CAIRO_EXTEND_REPEAT);
-
- cairo_rectangle (cr, 0, 0, width, height);
- cairo_fill (cr);
-
- gtk_container_propagate_draw (GTK_CONTAINER (widget),
- gtk_bin_get_child(GTK_BIN
(widget)), cr);
- return TRUE;
- }
+ static gboolean draw_event_cb (GtkWidget *widget, cairo_t *cr, YGAlignment
*pThis, int width, int height)
+ {
+ gdk_cairo_set_source_pixbuf (cr, pThis->m_background_pixbuf, 0, 0);
+ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+
+ cairo_rectangle (cr, 0, 0, width, height);
+ cairo_fill (cr);
+
+ gtk_container_propagate_draw (GTK_CONTAINER (widget),
+ gtk_bin_get_child(GTK_BIN (widget)), cr);
+
+ return TRUE;
+ }
};
YAlignment *YGWidgetFactory::createAlignment (YWidget *parent, YAlignmentType
halign,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-gtk-2.42.1/src/YGUI.h
new/libyui-gtk-2.42.1/src/YGUI.h
--- old/libyui-gtk-2.42.1/src/YGUI.h 2012-09-07 12:37:09.000000000 +0200
+++ new/libyui-gtk-2.42.1/src/YGUI.h 2012-11-13 12:13:04.000000000 +0100
@@ -215,7 +215,7 @@
#endif
virtual bool openContextMenu (const YItemCollection &itemCollection);
-
+
private:
// for screenshots:
std::map <std::string, int> screenShotNb;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
