← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xchat-gnome/trusty-updates

« back to all changes in this revision

Viewing changes to src/fe-gnome/setup-dialog.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-07-05 12:27:58 UTC
  • mfrom: (1.1.19 upstream) (2.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20110705122758-bkl6xii0ebfddtmh
Tags: 1:0.30.0~git20100421.29cc76-1ubuntu1
https://launchpad.net/bugs/773847
https://launchpad.net/bugs/374686
* Merge with Debian unstable, remaining changes: (LP: #773847)
  - debian/control:
    - add Build-Depends on liblaunchpad-integration-dev.
    - xchat-gnome Suggests: xchat-gnome-indicator.
  - debian/patches/02_lpi.patch: add Launchpad integration items to the help
    menu
  - debian/patches/10_xchat-gnome-close-event.patch: add events for window
    close.
  - debian/patches/04_autojoin_ubuntu_chan.patch: add the Ubuntu network
    as default selection and default to autojoining #ubuntu.
  - debian/patches/20_add_gui_focus.patch: implement GUI focus from XChat.
  - debian/patches/51_freenode_default_port_8001.patch: Drop ports 666x
    for FreeNode to workaround a possible DCC exploit.
  - debian/patches/95_apturl-support.patch: support apt://-urls.
  - debian/watch: also look for unstable versions
  - debian/xchat-gnome.gconf-defaults: Set the default enabled plugins,
    indicator, netmonitor, and notifyosd.
* debian/patches/52_no_zero_width_pixmaps.patch: dropped, applied upstream.
* debian/patches/98_ice_depends_for_eggsmclient.patch: replaced by
  01_link_libice.patch.
* debian/control: remove duplicate entry in Build-Depends for intltool.
* debian/xchat-gnome.install: also install the xchat-gnome.desktop file from
  /usr/share/applications in xchat-gnome rather than xchat-gnome-common.
  (LP: #374686)
* debian/rules: update the xchat-gnome-common binary-install target to not
  keep a duplicate copy of the xchat-gnome.desktop file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/fe-gnome/setup-dialog.c
22
22
#include <config.h>
23
23
#include <glib/gi18n.h>
24
24
#include <gconf/gconf-client.h>
25
 
#include <glade/glade-xml.h>
26
25
#include <gtk/gtk.h>
27
26
#include <string.h>
28
27
#include "setup-dialog.h"
42
41
        gchar *path = locate_data_file ("setup-dialog.glade");
43
42
        g_assert (path != NULL);
44
43
 
45
 
        GladeXML *xml = glade_xml_new (path, NULL, NULL);
46
 
        g_assert (xml != NULL);
47
 
 
48
 
        GtkWidget *window = glade_xml_get_widget (xml, "setup window");
 
44
        GtkBuilder *xml = gtk_builder_new ();
 
45
        g_assert (gtk_builder_add_from_file ( xml, path, NULL) != 0); 
 
46
 
 
47
        g_free (path);
 
48
 
 
49
        GtkWidget *window = GTK_WIDGET (gtk_builder_get_object (xml,"setup window"));
49
50
 
50
51
        GtkSizeGroup *group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
51
 
        nick_entry = glade_xml_get_widget (xml, "nick name entry");
52
 
        real_entry = glade_xml_get_widget (xml, "real name entry");
 
52
        nick_entry = GTK_WIDGET (gtk_builder_get_object (xml, "nick name entry"));
 
53
        real_entry = GTK_WIDGET (gtk_builder_get_object (xml, "real name entry"));
53
54
        gtk_size_group_add_widget (group, nick_entry);
54
55
        gtk_size_group_add_widget (group, real_entry);
55
56
        g_signal_connect (G_OBJECT (nick_entry), "changed", G_CALLBACK (entry_changed), NULL);
60
61
        gtk_entry_set_text (GTK_ENTRY (real_entry), g_get_real_name ());
61
62
        gtk_widget_grab_focus (nick_entry);
62
63
 
63
 
        ok_button = glade_xml_get_widget (xml, "ok button");
 
64
        ok_button = GTK_WIDGET (gtk_builder_get_object (xml, "ok button"));
64
65
        g_signal_connect (G_OBJECT (ok_button), "clicked", G_CALLBACK (ok_clicked), NULL);
65
66
 
66
67
        gtk_widget_show_all (window);
70
71
        }
71
72
 
72
73
        g_object_unref (xml);
73
 
        g_free (path);
74
74
        gtk_widget_destroy (window);
75
75
}
76
76