applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[default-apps] Remove libglade dep from default-applications capplet

Browse source
This commit is contained in:
Felix Riemann 2009-07-10 15:00:29 +02:00
parent 0b65af5fad
commit 80e3300d27
7 changed files with 1418 additions and 2192 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/default-applications/Makefile.am
View file

@ -13,8 +13,8 @@ gnome_default_applications_properties_SOURCES = \
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
gladedir = $(pkgdatadir)/glade uidir = $(pkgdatadir)/ui
dist_glade_DATA = gnome-default-applications-properties.glade dist_ui_DATA = gnome-default-applications-properties.ui
gnome-at-visual: gnome-at-commandline.in gnome-at-visual: gnome-at-commandline.in
cp $< $@ cp $< $@
@ -42,7 +42,7 @@ INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
$(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \ $(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"\ -DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
-DGNOMECC_GLADE_DIR=\""$(gladedir)"\" \ -DGNOMECC_UI_DIR=\""$(uidir)"\" \
-DGNOMECC_APPS_DIR=\""$(xmldatadir)"\" -DGNOMECC_APPS_DIR=\""$(xmldatadir)"\"
icons16dir = $(datadir)/icons/hicolor/16x16/apps icons16dir = $(datadir)/icons/hicolor/16x16/apps

88
capplets/default-applications/gnome-da-capplet.c
View file

@ -259,11 +259,11 @@ static struct {
static void static void
theme_changed_cb (GtkIconTheme *theme, GnomeDACapplet *capplet) theme_changed_cb (GtkIconTheme *theme, GnomeDACapplet *capplet)
{ {
GtkWidget *icon; GObject *icon;
gint i; gint i;
for (i = 0; i < G_N_ELEMENTS (icons); i++) { for (i = 0; i < G_N_ELEMENTS (icons); i++) {
icon = glade_xml_get_widget (capplet->xml, icons[i].name); icon = gtk_builder_get_object (capplet->builder, icons[i].name);
set_icon (GTK_IMAGE (icon), theme, icons[i].icon); set_icon (GTK_IMAGE (icon), theme, icons[i].icon);
} }
@ -649,19 +649,30 @@ fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list)
-1); -1);
} }
static GtkWidget*
_gtk_builder_get_widget (GtkBuilder *builder, const gchar *name)
{
return GTK_WIDGET (gtk_builder_get_object (builder, name));
}
static void static void
show_dialog (GnomeDACapplet *capplet, const gchar *start_page) show_dialog (GnomeDACapplet *capplet, const gchar *start_page)
{ {
GObject *obj; GObject *obj;
GtkBuilder *builder;
guint builder_result;
if (g_file_test (GNOMECC_GLADE_DIR "/gnome-default-applications-properties.glade", G_FILE_TEST_EXISTS) != FALSE) { capplet->builder = builder = gtk_builder_new ();
capplet->xml = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-default-applications-properties.glade", NULL, NULL);
if (g_file_test (GNOMECC_UI_DIR "/gnome-default-applications-properties.ui", G_FILE_TEST_EXISTS) != FALSE) {
builder_result = gtk_builder_add_from_file (builder, GNOMECC_UI_DIR "/gnome-default-applications-properties.ui", NULL);
} }
else { else {
capplet->xml = glade_xml_new ("./gnome-default-applications-properties.glade", NULL, NULL); builder_result = gtk_builder_add_from_file (builder, "./gnome-default-applications-properties.ui", NULL);
} }
if (capplet->xml == NULL) { if (builder_result == 0) {
GtkWidget *dialog; GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
@ -675,43 +686,43 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page)
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
capplet->window = glade_xml_get_widget (capplet->xml, "preferred_apps_dialog"); capplet->window = _gtk_builder_get_widget (builder,"preferred_apps_dialog");
g_signal_connect (capplet->window, "response", G_CALLBACK (close_cb), NULL); g_signal_connect (capplet->window, "response", G_CALLBACK (close_cb), NULL);
capplet->web_browser_command_entry = glade_xml_get_widget (capplet->xml, "web_browser_command_entry"); capplet->web_browser_command_entry = _gtk_builder_get_widget (builder, "web_browser_command_entry");
capplet->web_browser_command_label = glade_xml_get_widget (capplet->xml, "web_browser_command_label"); capplet->web_browser_command_label = _gtk_builder_get_widget (builder, "web_browser_command_label");
capplet->web_browser_terminal_checkbutton = glade_xml_get_widget (capplet->xml, "web_browser_terminal_checkbutton"); capplet->web_browser_terminal_checkbutton = _gtk_builder_get_widget(builder, "web_browser_terminal_checkbutton");
capplet->default_radiobutton = glade_xml_get_widget (capplet->xml, "web_browser_default_radiobutton"); capplet->default_radiobutton = _gtk_builder_get_widget (builder, "web_browser_default_radiobutton");
capplet->new_win_radiobutton = glade_xml_get_widget (capplet->xml, "web_browser_new_win_radiobutton"); capplet->new_win_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_win_radiobutton");
capplet->new_tab_radiobutton = glade_xml_get_widget (capplet->xml, "web_browser_new_tab_radiobutton"); capplet->new_tab_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_tab_radiobutton");
capplet->mail_reader_command_entry = glade_xml_get_widget (capplet->xml, "mail_reader_command_entry"); capplet->mail_reader_command_entry = _gtk_builder_get_widget (builder, "mail_reader_command_entry");
capplet->mail_reader_command_label = glade_xml_get_widget (capplet->xml, "mail_reader_command_label"); capplet->mail_reader_command_label = _gtk_builder_get_widget (builder, "mail_reader_command_label");
capplet->mail_reader_terminal_checkbutton = glade_xml_get_widget (capplet->xml, "mail_reader_terminal_checkbutton"); capplet->mail_reader_terminal_checkbutton = _gtk_builder_get_widget (builder, "mail_reader_terminal_checkbutton");
capplet->terminal_command_entry = glade_xml_get_widget (capplet->xml, "terminal_command_entry"); capplet->terminal_command_entry = _gtk_builder_get_widget (builder, "terminal_command_entry");
capplet->terminal_command_label = glade_xml_get_widget (capplet->xml, "terminal_command_label"); capplet->terminal_command_label = _gtk_builder_get_widget (builder, "terminal_command_label");
capplet->terminal_exec_flag_entry = glade_xml_get_widget (capplet->xml, "terminal_exec_flag_entry"); capplet->terminal_exec_flag_entry = _gtk_builder_get_widget (builder, "terminal_exec_flag_entry");
capplet->terminal_exec_flag_label = glade_xml_get_widget (capplet->xml, "terminal_exec_flag_label"); capplet->terminal_exec_flag_label = _gtk_builder_get_widget (builder, "terminal_exec_flag_label");
capplet->media_player_command_entry = glade_xml_get_widget (capplet->xml, "media_player_command_entry"); capplet->media_player_command_entry = _gtk_builder_get_widget (builder, "media_player_command_entry");
capplet->media_player_command_label = glade_xml_get_widget (capplet->xml, "media_player_command_label"); capplet->media_player_command_label = _gtk_builder_get_widget (builder, "media_player_command_label");
capplet->media_player_terminal_checkbutton = glade_xml_get_widget (capplet->xml, "media_player_terminal_checkbutton"); capplet->media_player_terminal_checkbutton = _gtk_builder_get_widget (builder, "media_player_terminal_checkbutton");
capplet->visual_command_entry = glade_xml_get_widget (capplet->xml, "visual_command_entry"); capplet->visual_command_entry = _gtk_builder_get_widget (builder, "visual_command_entry");
capplet->visual_command_label = glade_xml_get_widget (capplet->xml, "visual_command_label"); capplet->visual_command_label = _gtk_builder_get_widget (builder, "visual_command_label");
capplet->visual_startup_checkbutton = glade_xml_get_widget (capplet->xml, "visual_start_checkbutton"); capplet->visual_startup_checkbutton = _gtk_builder_get_widget (builder, "visual_start_checkbutton");
capplet->mobility_command_entry = glade_xml_get_widget (capplet->xml, "mobility_command_entry"); capplet->mobility_command_entry = _gtk_builder_get_widget (builder, "mobility_command_entry");
capplet->mobility_command_label = glade_xml_get_widget (capplet->xml, "mobility_command_label"); capplet->mobility_command_label = _gtk_builder_get_widget (builder, "mobility_command_label");
capplet->mobility_startup_checkbutton = glade_xml_get_widget (capplet->xml, "mobility_start_checkbutton"); capplet->mobility_startup_checkbutton = _gtk_builder_get_widget (builder, "mobility_start_checkbutton");
capplet->web_combo_box = glade_xml_get_widget (capplet->xml, "web_browser_combobox"); capplet->web_combo_box = _gtk_builder_get_widget (builder, "web_browser_combobox");
capplet->mail_combo_box = glade_xml_get_widget (capplet->xml, "mail_reader_combobox"); capplet->mail_combo_box = _gtk_builder_get_widget (builder, "mail_reader_combobox");
capplet->term_combo_box = glade_xml_get_widget (capplet->xml, "terminal_combobox"); capplet->term_combo_box = _gtk_builder_get_widget (builder, "terminal_combobox");
capplet->media_combo_box = glade_xml_get_widget (capplet->xml, "media_player_combobox"); capplet->media_combo_box = _gtk_builder_get_widget (builder, "media_player_combobox");
capplet->visual_combo_box = glade_xml_get_widget (capplet->xml, "visual_combobox"); capplet->visual_combo_box = _gtk_builder_get_widget (builder, "visual_combobox");
capplet->mobility_combo_box = glade_xml_get_widget (capplet->xml, "mobility_combobox"); capplet->mobility_combo_box = _gtk_builder_get_widget (builder, "mobility_combobox");
g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet); g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet);
screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet); screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet);
@ -863,12 +874,13 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page)
page_name = g_strconcat (start_page, "_vbox", NULL); page_name = g_strconcat (start_page, "_vbox", NULL);
w = glade_xml_get_widget (capplet->xml, page_name); w = _gtk_builder_get_widget (builder, page_name);
if (w != NULL) { if (w != NULL) {
GtkNotebook *nb; GtkNotebook *nb;
gint pindex; gint pindex;
nb = GTK_NOTEBOOK (glade_xml_get_widget (capplet->xml, "preferred_apps_notebook")); nb = GTK_NOTEBOOK (_gtk_builder_get_widget (builder,
"preferred_apps_notebook"));
pindex = gtk_notebook_page_num (nb, w); pindex = gtk_notebook_page_num (nb, w);
if (pindex != -1) if (pindex != -1)
gtk_notebook_set_current_page (nb, pindex); gtk_notebook_set_current_page (nb, pindex);
@ -903,8 +915,6 @@ main (int argc, char **argv)
capplet_init (context, &argc, &argv); capplet_init (context, &argc, &argv);
glade_init ();
capplet = g_new0 (GnomeDACapplet, 1); capplet = g_new0 (GnomeDACapplet, 1);
capplet->gconf = gconf_client_get_default (); capplet->gconf = gconf_client_get_default ();
gnome_da_xml_load_list (capplet); gnome_da_xml_load_list (capplet);

3
capplets/default-applications/gnome-da-capplet.h
View file

@ -22,7 +22,6 @@
#define _GNOME_DA_CAPPLET_H_ #define _GNOME_DA_CAPPLET_H_
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glade/glade.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
// Set http, https, about, and unknown keys to the chosen web browser. // Set http, https, about, and unknown keys to the chosen web browser.
@ -73,7 +72,7 @@
typedef struct _GnomeDACapplet GnomeDACapplet; typedef struct _GnomeDACapplet GnomeDACapplet;
struct _GnomeDACapplet { struct _GnomeDACapplet {
GladeXML *xml; GtkBuilder *builder;
GtkIconTheme *icon_theme; GtkIconTheme *icon_theme;

2
capplets/default-applications/gnome-da-xml.c
View file

@ -318,6 +318,6 @@ gnome_da_xml_free (GnomeDACapplet *capplet)
g_list_free (capplet->visual_ats); g_list_free (capplet->visual_ats);
g_list_free (capplet->mobility_ats); g_list_free (capplet->mobility_ats);
g_object_unref (capplet->xml); g_object_unref (capplet->builder);
g_free (capplet); g_free (capplet);
} }

2146
capplets/default-applications/gnome-default-applications-properties.glade
View file

File diff suppressed because it is too large Load diff

1363
capplets/default-applications/gnome-default-applications-properties.ui Normal file
View file

File diff suppressed because it is too large Load diff

2
po/POTFILES.in
View file

@ -36,7 +36,7 @@ capplets/common/gnome-theme-info.c
capplets/default-applications/default-applications.desktop.in.in capplets/default-applications/default-applications.desktop.in.in
capplets/default-applications/gnome-at-session.desktop.in.in capplets/default-applications/gnome-at-session.desktop.in.in
capplets/default-applications/gnome-da-capplet.c capplets/default-applications/gnome-da-capplet.c
capplets/default-applications/gnome-default-applications-properties.glade [type: gettext/glade]capplets/default-applications/gnome-default-applications-properties.ui
capplets/default-applications/gnome-default-applications.xml.in capplets/default-applications/gnome-default-applications.xml.in
[type: gettext/glade]capplets/display/display-capplet.ui [type: gettext/glade]capplets/display/display-capplet.ui
capplets/display/display-properties.desktop.in.in capplets/display/display-properties.desktop.in.in