diff options
| author | Scott Balneaves <[email protected]> | 2012-12-12 19:21:20 -0600 |
|---|---|---|
| committer | Scott Balneaves <[email protected]> | 2012-12-12 19:21:20 -0600 |
| commit | 61b61c3fb75dee78f362558764149e18df75c96a (patch) | |
| tree | cce2a85914a7c3e97d19dcb1fc5b240bb70d48f5 /capplets/about-me | |
| parent | 6540605b4e786e2ce75d2dd89aa3c66e961265b8 (diff) | |
| download | mate-control-center-61b61c3fb75dee78f362558764149e18df75c96a.tar.bz2 mate-control-center-61b61c3fb75dee78f362558764149e18df75c96a.tar.xz | |
First cut at fixing about-me
Diffstat (limited to 'capplets/about-me')
| -rw-r--r-- | capplets/about-me/mate-about-me-dialog.ui | 1512 | ||||
| -rw-r--r-- | capplets/about-me/mate-about-me-password.c | 9 | ||||
| -rw-r--r-- | capplets/about-me/mate-about-me.c | 35 |
3 files changed, 83 insertions, 1473 deletions
diff --git a/capplets/about-me/mate-about-me-dialog.ui b/capplets/about-me/mate-about-me-dialog.ui index fdf79b6e..5324d220 100644 --- a/capplets/about-me/mate-about-me-dialog.ui +++ b/capplets/about-me/mate-about-me-dialog.ui @@ -1,29 +1,59 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="about-me-dialog"> + <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">About Me</property> <property name="type_hint">dialog</property> - <property name="has_separator">False</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox2"> + <object class="GtkBox" id="dialog-vbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="closebutton1"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkVBox" id="vbox55"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">5</property> - <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkHBox" id="hbox58"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox59"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkButton" id="button-image"> @@ -46,6 +76,7 @@ <child> <object class="GtkLabel" id="fullname"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Full Name</property> </object> @@ -57,21 +88,25 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkVBox" id="buttons_vbox"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox60"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label1012"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="yalign">0</property> <property name="label" translatable="yes">User name:</property> </object> @@ -84,9 +119,12 @@ <child> <object class="GtkLabel" id="login"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="yalign">0</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -140,6 +178,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -151,1466 +190,13 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox61"> - <property name="visible">True</property> - <child> - <object class="GtkNotebook" id="notebook2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkVBox" id="vbox57"> - <property name="visible">True</property> - <property name="border_width">12</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> - <child> - <object class="GtkVBox" id="vbox62"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label1017"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Email</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox62"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label1058"> - <property name="visible">True</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="table121"> - <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="label1015"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Work:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">email-work-e</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1016"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes" comments="Home vs Work (email)">_Home:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">email-home-e</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="email-work-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="email-home-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox63"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label1021"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Telephone</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox63"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label1059"> - <property name="visible">True</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="table122"> - <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">4</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="label1018"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Wor_k:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">phone-work-e</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1019"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes" comments="Home vs Work (phone)">Hom_e:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">phone-home-e</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="phone-work-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="phone-home-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="phone-mobile-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="phone-work-fax-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1020"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Mobile:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">phone-mobile-e</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1057"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Work _fax:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">phone-work-fax-e</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox64"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label1023"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Instant Messaging</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox64"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label1060"> - <property name="visible">True</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="table123"> - <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">4</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="label1022"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_XMPP:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">im-jabber-e</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="im-jabber-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="im-msn-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1052"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Yahoo:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">im-yahoo-e</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1053"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">M_SN:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">im-msn-e</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1054"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">IC_Q:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">im-icq-e</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1055"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">A_IM/iChat:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">im-aim-e</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1056"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_GroupWise:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">im-groupwise-e</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="im-icq-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="im-yahoo-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="im-aim-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="im-groupwise-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="label1024"> - <property name="visible">True</property> - <property name="label" translatable="yes">Contact</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox60"> - <property name="visible">True</property> - <property name="border_width">12</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> - <child> - <object class="GtkVBox" id="vbox61"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkVBox" id="vbox65"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="label1043"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes" comments="Home vs Work (address)">Home</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox65"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label1061"> - <property name="visible">True</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="addr-table-1"> - <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">4</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="label1037"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Address:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addr-street-1</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="addr-scrolledwindow-1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTextView" id="addr-street-1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="accepts_tab">False</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1038"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">C_ity:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addr-locality-1</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1039"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_ZIP/Postal code:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addr-code-1</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1040"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_State/Province:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addr-region-1</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1041"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Co_untry:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addr-country-1</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1042"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">P._O. box:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addr-po-1</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="addr-po-1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="addr-locality-1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="addr-code-1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="addr-country-1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="addr-region-1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox66"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label1050"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Work</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox66"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label1062"> - <property name="visible">True</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="addr-table-2"> - <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">4</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="label1044"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">A_ddress:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addr-street-2</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="addr-scrolledwindow-2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTextView" id="addr-street-2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="accepts_tab">False</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1045"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">ZIP/_Postal code:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addr-code-2</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1046"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">State/Pro_vince:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addr-region-2</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1047"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Cou_ntry:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addr-country-2</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1048"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">P.O. _box:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addr-po-2</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1049"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Ci_ty:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addr-locality-2</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="addr-po-2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="addr-locality-2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="addr-code-2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="addr-region-2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="addr-country-2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="label1051"> - <property name="visible">True</property> - <property name="label" translatable="yes">Address</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox59"> - <property name="visible">True</property> - <property name="border_width">12</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> - <child> - <object class="GtkVBox" id="vbox67"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label1028"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Web</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox67"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label1063"> - <property name="visible">True</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="table124"> - <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="label1025"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Home page:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">web-homepage-e</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1026"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Web _log:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">web-weblog-e</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1027"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Cale_ndar:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">web-calendar-e</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="web-homepage-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="web-weblog-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="web-calendar-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox68"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label1035"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Job</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox68"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label1064"> - <property name="visible">True</property> - <property name="label"> </property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="table125"> - <property name="visible">True</property> - <property name="n_rows">6</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="label1029"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Profession:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">job-profession-e</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1030"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">C_ompany:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">job-company-e</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1031"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Manager:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">job-manager-e</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1032"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Title:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">job-title-e</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1033"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Department:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">job-dept-e</property> - </object> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1034"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">A_ssistant:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">job-assistant-e</property> - </object> - <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="job-profession-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="job-company-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="job-manager-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="job-title-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="job-dept-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="job-assistant-e"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="y_options"></property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="label1036"> - <property name="visible">True</property> - <property name="label" translatable="yes">Personal Info</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area2"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="closebutton1"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> + <placeholder/> </child> </object> <packing> <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> diff --git a/capplets/about-me/mate-about-me-password.c b/capplets/about-me/mate-about-me-password.c index 80f8e4ca..87bf084c 100644 --- a/capplets/about-me/mate-about-me-password.c +++ b/capplets/about-me/mate-about-me-password.c @@ -210,6 +210,7 @@ spawn_passwd (PasswordDialog *pdialog, GError **error) g_set_error (error, PASSDLG_ERROR, PASSDLG_ERROR_BACKEND, + "%s", strerror (errno)); /* Clean up */ @@ -427,7 +428,7 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswordDialog *pdi GError *error = NULL; gchar *msg = NULL; /* Status error message */ - GtkBuilder *dialog; + GtkBuilder *dialog = NULL; gboolean reinit = FALSE; @@ -722,13 +723,13 @@ passdlg_error_dialog (GtkWindow *parent, const gchar *title, dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - msg); + "%s", msg); if (title) gtk_window_set_title (GTK_WINDOW (dialog), title); if (details) gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - details); + "%s", details); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -872,7 +873,7 @@ passdlg_authenticate (GtkButton *button, PasswordDialog *pdialog) static guint passdlg_validate_passwords (PasswordDialog *pdialog) { - GtkBuilder *dialog; + GtkBuilder *dialog = NULL; const gchar *new_password, *retyped_password; glong nlen, rlen; diff --git a/capplets/about-me/mate-about-me.c b/capplets/about-me/mate-about-me.c index 0ef9156f..235e414b 100644 --- a/capplets/about-me/mate-about-me.c +++ b/capplets/about-me/mate-about-me.c @@ -26,7 +26,9 @@ #include <glib/gstdio.h> #include <gio/gio.h> #include <unistd.h> +#if 0 #include <libebook/e-book.h> +#endif #include <dbus/dbus-glib-bindings.h> #define MATE_DESKTOP_USE_UNSTABLE_API @@ -45,23 +47,26 @@ #define EMAIL_SLOTS 4 typedef struct { +#if 0 EContact *contact; EBook *book; +#endif GtkBuilder *dialog; GtkWidget *enable_fingerprint_button; GtkWidget *disable_fingerprint_button; - GtkWidget *image_chooser; + GtkWidget *image_chooser; GdkScreen *screen; GtkIconTheme *theme; MateDesktopThumbnailFactory *thumbs; +#if 0 EContactAddress *addr1; EContactAddress *addr2; gchar *email[EMAIL_SLOTS]; const gchar *email_types[EMAIL_SLOTS]; - +#endif gboolean have_image; gboolean image_changed; gboolean create_self; @@ -80,6 +85,7 @@ struct WidToCid { guint cid; }; +#if 0 enum { ADDRESS_STREET = 1, ADDRESS_POBOX, @@ -144,7 +150,7 @@ struct WidToCid ids[] = { #define ATTRIBUTE_OTHER "OTHER" static void about_me_set_address_field (EContactAddress *, guint, gchar *); - +#endif /*** Utility functions ***/ static void @@ -154,7 +160,7 @@ about_me_error (GtkWindow *parent, gchar *str) dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, str); + GTK_BUTTONS_OK, "%s", str); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -164,6 +170,7 @@ about_me_error (GtkWindow *parent, gchar *str) static void about_me_destroy (void) { +#if 0 e_contact_address_free (me->addr1); e_contact_address_free (me->addr2); @@ -171,13 +178,16 @@ about_me_destroy (void) g_object_unref (me->contact); if (me->book) g_object_unref (me->book); +#endif if (me->dialog) g_object_unref (me->dialog); +#if 0 g_free (me->email[0]); g_free (me->email[1]); g_free (me->email[2]); g_free (me->email[3]); +#endif g_free (me->person); g_free (me->login); @@ -186,6 +196,7 @@ about_me_destroy (void) me = NULL; } +#if 0 static void about_me_update_email (MateAboutMe *me) { @@ -333,6 +344,7 @@ about_me_focus_out (GtkWidget *widget, GdkEventFocus *event, MateAboutMe *unused return FALSE; } + /* * Helpers */ @@ -497,8 +509,15 @@ about_me_load_string_field (MateAboutMe *me, const gchar *wid, guint cid, guint g_signal_connect (widget, "focus-out-event", G_CALLBACK (about_me_focus_out), me); } +#endif + +#if 0 static void about_me_load_photo (MateAboutMe *me, EContact *contact) +#endif + +static void +about_me_load_photo (MateAboutMe *me) { GtkBuilder *dialog; EContactPhoto *photo; @@ -621,6 +640,7 @@ about_me_update_photo (MateAboutMe *me) static void about_me_load_info (MateAboutMe *me) { +#if 0 gint i; if (me->create_self == FALSE) { @@ -638,7 +658,7 @@ about_me_load_info (MateAboutMe *me) for (i = 0; ids[i].wid != NULL; i++) { about_me_load_string_field (me, ids[i].wid, ids[i].cid, i); } - +#endif set_fingerprint_label (me->enable_fingerprint_button, me->disable_fingerprint_button); } @@ -883,6 +903,7 @@ about_me_setup_dialog (void) main_dialog, G_CONNECT_SWAPPED); +#if 0 /* Get the self contact */ if (!e_book_get_self (&me->contact, &me->book, &error)) { if (error->code == E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED) { @@ -914,6 +935,7 @@ about_me_setup_dialog (void) } else { about_me_setup_email (me); } +#endif me->login = g_strdup (g_get_user_name ()); me->username = g_strdup (g_get_real_name ()); @@ -953,6 +975,7 @@ about_me_setup_dialog (void) g_signal_connect (me->image_chooser, "changed", G_CALLBACK (about_me_image_changed_cb), me); +#if 0 /* Address tab: set up the focus chains */ chain = g_list_prepend (NULL, WID ("addr-country-1")); chain = g_list_prepend (chain, WID ("addr-po-1")); @@ -973,7 +996,7 @@ about_me_setup_dialog (void) widget = WID ("addr-table-2"); gtk_container_set_focus_chain (GTK_CONTAINER (widget), chain); g_list_free (chain); - +#endif about_me_load_info (me); gtk_widget_show_all (main_dialog); |