brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rip out code for adding image to the dialog

Browse Source
This commit is contained in:
Stephen Browne 2002-05-30 10:53:32 +00:00
parent 2f74af1c04
commit bfd67fadef
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,6 +1,13 @@
2002-05-30 Stephen Browne <stephen.browne@sun.com> 2002-05-30 Stephen Browne <stephen.browne@sun.com>
* src/tools/metacity-properties.glade * src/tools/metacity-properties.c:
Some day I'll make all my changes in one commit :)
Needed to rip out code for adding icon to the dialog since it was
removed from teh galde file in my previous change.
2002-05-30 Stephen Browne <stephen.browne@sun.com>
* src/tools/metacity-properties.glade:
Some UI changes demanded by Pat and Calum. Some UI changes demanded by Pat and Calum.
Make Close default response Make Close default response
Change mnemonic for Click so as not to clash with Close Change mnemonic for Click so as not to clash with Close

4
src/tools/metacity-properties.c
View File

@ -105,7 +105,7 @@ main (int argc, char **argv)
{ {
GladeXML *xml; GladeXML *xml;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
GtkWidget *window, *icon; GtkWidget *window;
bindtextdomain (GETTEXT_PACKAGE, METACITY_LOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, METACITY_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@ -120,13 +120,11 @@ main (int argc, char **argv)
point_radio = glade_xml_get_widget (xml, "Pointfocus"); point_radio = glade_xml_get_widget (xml, "Pointfocus");
autoraise_check = glade_xml_get_widget (xml, "Autoraise"); autoraise_check = glade_xml_get_widget (xml, "Autoraise");
window = glade_xml_get_widget (xml, "Mainwindow"); window = glade_xml_get_widget (xml, "Mainwindow");
icon = glade_xml_get_widget (xml, "Icon");
pixbuf = gdk_pixbuf_new_from_file (METACITY_PROPS_ICON_DIR pixbuf = gdk_pixbuf_new_from_file (METACITY_PROPS_ICON_DIR
"/metacity-properties.png", NULL); "/metacity-properties.png", NULL);
gtk_window_set_icon (GTK_WINDOW (window), pixbuf); gtk_window_set_icon (GTK_WINDOW (window), pixbuf);
gtk_image_set_from_pixbuf (GTK_IMAGE(icon) , pixbuf);
g_object_unref (G_OBJECT (pixbuf)); g_object_unref (G_OBJECT (pixbuf));
gconf_client = gconf_client_get_default (); gconf_client = gconf_client_get_default ();