Author: kelnos
Date: 2008-10-17 09:21:03 +0000 (Fri, 17 Oct 2008)
New Revision: 28279
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/libxfsm/xfsm-util.c
xfce4-session/trunk/libxfsm/xfsm-util.h
xfce4-session/trunk/xfce4-session/xfsm-chooser.c
Log:
* xfce4-session/xfsm-chooser.c: Use xfce_create_mixed_button()
instead of xfsm_imgbtn_new() (bug 1446).
* libxfsm/xfsm-utils.[ch]: Remove xfsm_imgbtn_new().
Modified: xfce4-session/trunk/ChangeLog
===================================================================
--- xfce4-session/trunk/ChangeLog 2008-10-17 09:14:10 UTC (rev 28278)
+++ xfce4-session/trunk/ChangeLog 2008-10-17 09:21:03 UTC (rev 28279)
@@ -1,5 +1,11 @@
2008-10-17 Brian Tarricone <[EMAIL PROTECTED]>
+ * xfce4-session/xfsm-chooser.c: Use xfce_create_mixed_button()
+ instead of xfsm_imgbtn_new() (bug 1446).
+ * libxfsm/xfsm-utils.[ch]: Remove xfsm_imgbtn_new().
+
+2008-10-17 Brian Tarricone <[EMAIL PROTECTED]>
+
* xfce4-session/xfsm-manager.c: Don't ditch clients that fail
to restart solely because fork() failed in xfce4-session.
Modified: xfce4-session/trunk/libxfsm/xfsm-util.c
===================================================================
--- xfce4-session/trunk/libxfsm/xfsm-util.c 2008-10-17 09:14:10 UTC (rev
28278)
+++ xfce4-session/trunk/libxfsm/xfsm-util.c 2008-10-17 09:21:03 UTC (rev
28279)
@@ -43,40 +43,6 @@
#include <libxfsm/xfsm-util.h>
-GtkWidget *
-xfsm_imgbtn_new(const gchar *text, const gchar *icon, GtkWidget **label_ret)
-{
- GtkWidget *button;
- GtkWidget *align;
- GtkWidget *image;
- GtkWidget *hbox;
- GtkWidget *label;
-
- button = gtk_button_new();
-
- align = gtk_alignment_new(0.5f, 0.5f, 0.0f, 0.0f);
- gtk_container_add(GTK_CONTAINER(button), align);
- gtk_widget_show(align);
-
- hbox = gtk_hbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(align), hbox);
- gtk_widget_show(hbox);
-
- image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON);
- gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 2);
- gtk_widget_show(image);
-
- label = gtk_label_new_with_mnemonic(text);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
- gtk_widget_show(label);
-
- if (label_ret != NULL)
- *label_ret = label;
-
- return button;
-}
-
-
gboolean
xfsm_start_application (gchar **command,
gchar **environment,
Modified: xfce4-session/trunk/libxfsm/xfsm-util.h
===================================================================
--- xfce4-session/trunk/libxfsm/xfsm-util.h 2008-10-17 09:14:10 UTC (rev
28278)
+++ xfce4-session/trunk/libxfsm/xfsm-util.h 2008-10-17 09:21:03 UTC (rev
28279)
@@ -30,8 +30,6 @@
G_BEGIN_DECLS;
-GtkWidget *xfsm_imgbtn_new(const gchar *, const gchar *, GtkWidget **);
-
gboolean xfsm_start_application (gchar **command,
gchar **environment,
GdkScreen *screen,
Modified: xfce4-session/trunk/xfce4-session/xfsm-chooser.c
===================================================================
--- xfce4-session/trunk/xfce4-session/xfsm-chooser.c 2008-10-17 09:14:10 UTC
(rev 28278)
+++ xfce4-session/trunk/xfce4-session/xfsm-chooser.c 2008-10-17 09:21:03 UTC
(rev 28279)
@@ -236,7 +236,7 @@
gtk_widget_show (chooser->tree);
/* "Logout" button */
- button = xfsm_imgbtn_new (_("Logout"), GTK_STOCK_QUIT, NULL);
+ button = xfce_create_mixed_button (GTK_STOCK_QUIT, _("Log out"));
gtk_tooltips_set_tip (chooser->tooltips, button,
_("Cancel the login attempt and return to "
"the login screen."),
@@ -246,7 +246,7 @@
gtk_widget_show (button);
/* "New" button */
- button = xfsm_imgbtn_new (_("New session"), GTK_STOCK_NEW, NULL);
+ button = xfce_create_mixed_button (GTK_STOCK_NEW, _("New session"));
gtk_tooltips_set_tip (chooser->tooltips, button,
_("Create a new session."),
NULL);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
