kov changed libgksu/trunk/ChangeLog, libgksu/trunk/configure.ac, libgksu/trunk/gksu-properties/Makefile.am, libgksu/trunk/gksu-properties/gksu-properties.c, libgksu/trunk/po/POTFILES.in
Gustavo Noronha
kov at alioth.debian.org
Mon Jun 29 18:03:36 UTC 2009
Mensagem de log:
2009-06-29 Sebastien Bacher <seb128 at ubuntu.com>
* gksu-properties/gksu-properties.c,
gksu-properties/Makefile.am,
configure.ac:
- use GtkBuilder instead of libglade
-----
Modified: libgksu/trunk/ChangeLog
===================================================================
--- libgksu/trunk/ChangeLog 2009-06-29 17:53:55 UTC (rev 868)
+++ libgksu/trunk/ChangeLog 2009-06-29 18:03:05 UTC (rev 869)
@@ -1,3 +1,10 @@
+2009-06-29 Sebastien Bacher <seb128 at ubuntu.com>
+
+ * gksu-properties/gksu-properties.c,
+ gksu-properties/Makefile.am,
+ configure.ac:
+ - use GtkBuilder instead of libglade
+
2009-06-29 Gustavo Noronha Silva <kov at debian.org>
* Release 2.0.12
Modified: libgksu/trunk/configure.ac
===================================================================
--- libgksu/trunk/configure.ac 2009-06-29 17:53:55 UTC (rev 868)
+++ libgksu/trunk/configure.ac 2009-06-29 18:03:05 UTC (rev 869)
@@ -41,7 +41,7 @@
AM_GCONF_SOURCE_2
PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0])
-PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0])
+PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.12, gconf-2.0])
# Checks for library functions.
ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl th zh_CN"
Modified: libgksu/trunk/gksu-properties/Makefile.am
===================================================================
--- libgksu/trunk/gksu-properties/Makefile.am 2009-06-29 17:53:55 UTC (rev 868)
+++ libgksu/trunk/gksu-properties/Makefile.am 2009-06-29 18:03:05 UTC (rev 869)
@@ -1,4 +1,4 @@
-AM_CFLAGS = -g -O2 -Wall
+AM_CFLAGS = -g -O2 -Wall -Wl,--export-dynamic
INCLUDES = ${GKSU_PROPERTIES_CFLAGS}
AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
@@ -6,8 +6,8 @@
gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS}
gksu_properties_SOURCES = gksu-properties.c
-gladedir = ${prefix}/share/${PACKAGE}
-glade_DATA = gksu-properties.glade
+uidir = ${prefix}/share/${PACKAGE}
+ui_DATA = gksu-properties.ui
@INTLTOOL_DESKTOP_RULE@
@@ -15,4 +15,4 @@
Desktop_in_files = gksu-properties.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-EXTRA_DIST = $(glade_DATA) $(Desktop_in_files)
+EXTRA_DIST = $(ui_DATA) $(Desktop_in_files)
Modified: libgksu/trunk/gksu-properties/gksu-properties.c
===================================================================
--- libgksu/trunk/gksu-properties/gksu-properties.c 2009-06-29 17:53:55 UTC (rev 868)
+++ libgksu/trunk/gksu-properties/gksu-properties.c 2009-06-29 18:03:05 UTC (rev 869)
@@ -1,13 +1,13 @@
#include <locale.h>
#include <string.h>
-#include <glade/glade.h>
+
#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
#include "../config.h"
#include "../libgksu/defines.h"
-static GladeXML *gui = NULL;
+static GtkBuilder *gui = NULL;
static GtkWidget *main_window;
static GtkWidget *grab_combo;
static GtkWidget *mode_combo;
@@ -114,7 +114,7 @@
create_dialog ()
{
GdkPixbuf *icon;
- main_window = glade_xml_get_widget (gui, "main_window");
+ main_window = GTK_WIDGET (gtk_builder_get_object (gui, "main_window"));
icon = gdk_pixbuf_new_from_file (DATA_DIR"/pixmaps/gksu.png", NULL);
if (icon)
gtk_window_set_icon (GTK_WINDOW(main_window), icon);
@@ -122,10 +122,10 @@
g_warning ("Error loading window icon %s",
DATA_DIR "/pixmaps/gksu.png\n");
- grab_combo = glade_xml_get_widget (gui, "grab_combo");
+ grab_combo = GTK_WIDGET (gtk_builder_get_object (gui, "grab_combo"));
update_grab_combo ();
- mode_combo = glade_xml_get_widget (gui, "mode_combo");
+ mode_combo = GTK_WIDGET (gtk_builder_get_object (gui, "mode_combo"));
update_mode_combo ();
gtk_widget_show_all (main_window);
@@ -221,21 +221,32 @@
int
main (int argc, char **argv)
{
+ GError* error = NULL;
+
bindtextdomain (PACKAGE, LOCALEDIR);
bind_textdomain_codeset (PACKAGE, "UTF-8");
textdomain (PACKAGE);
gtk_init (&argc, &argv);
- if (g_file_test ("gksu-properties.glade", G_FILE_TEST_EXISTS) == TRUE)
+ if (g_file_test ("gksu-properties.ui", G_FILE_TEST_EXISTS) == TRUE)
{
- gui = glade_xml_new ("gksu-properties.glade", NULL, NULL);
+ gui = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (gui, "gksu-properties.ui", &error))
+ {
+ g_warning ("Couldn't load builder file: s", error->message);
+ g_error_free (error);
+ }
}
- else if (g_file_test (PREFIX "/share/" PACKAGE "/gksu-properties.glade",
+ else if (g_file_test (PREFIX "/share/" PACKAGE "/gksu-properties.ui",
G_FILE_TEST_EXISTS) == TRUE)
{
- gui = glade_xml_new (PREFIX "/share/" PACKAGE "/gksu-properties.glade", NULL,
- NULL);
+ gui = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (gui, PREFIX "/share/" PACKAGE "/gksu-properties.ui", &error))
+ {
+ g_warning ("Couldn't load builder file: s", error->message);
+ g_error_free (error);
+ }
}
if (!gui) {
@@ -245,7 +256,7 @@
0,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- _("Failed to load glade file; please check your installation."));
+ _("Failed to load gtkui file; please check your installation."));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -253,7 +264,7 @@
return 1;
}
- glade_xml_signal_autoconnect (gui);
+ gtk_builder_connect_signals (gui, NULL);
gconf_client = gconf_client_get_default ();
Modified: libgksu/trunk/po/POTFILES.in
===================================================================
--- libgksu/trunk/po/POTFILES.in 2009-06-29 17:53:55 UTC (rev 868)
+++ libgksu/trunk/po/POTFILES.in 2009-06-29 18:03:05 UTC (rev 869)
@@ -2,6 +2,6 @@
libgksuui/gksuui-dialog.c
gksu-properties/gksu-properties.c
gksu-properties/gksu-properties.desktop.in
-gksu-properties/gksu-properties.glade
+[type: gettext/glade]gksu-properties/gksu-properties.ui
gksu.schemas.in
libgksu/gksu-run-helper.c
More information about the gksu-commits
mailing list