gnome-mud r724 - in trunk: . src ui
- From: lharris svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-mud r724 - in trunk: . src ui
- Date: Sun, 15 Feb 2009 23:05:00 +0000 (UTC)
Author: lharris
Date: Sun Feb 15 23:05:00 2009
New Revision: 724
URL: http://svn.gnome.org/viewvc/gnome-mud?rev=724&view=rev
Log:
Preference dialog changed for release.
Modified:
trunk/ChangeLog
trunk/src/mud-telnet-mccp.c
trunk/ui/prefs.glade
Modified: trunk/src/mud-telnet-mccp.c
==============================================================================
--- trunk/src/mud-telnet-mccp.c (original)
+++ trunk/src/mud-telnet-mccp.c Sun Feb 15 23:05:00 2009
@@ -31,7 +31,7 @@
GString *
mud_mccp_decompress(MudTelnet *telnet, guchar *buffer, guint32 length)
{
- GString *ret = g_string_new(NULL);
+ GString *ret = NULL;
gint zstatus;
gint i;
@@ -41,6 +41,8 @@
telnet->compress_out->next_in = buffer;
telnet->compress_out->avail_in = length;
+ ret = g_string_new(NULL);
+
while(1)
{
if(telnet->compress_out->avail_in < 1)
@@ -80,7 +82,7 @@
telnet->mccp = FALSE;
telnet->mccp_new = TRUE;
- return ret;
+ break;
}
if(zstatus == Z_BUF_ERROR)
Modified: trunk/ui/prefs.glade
==============================================================================
--- trunk/ui/prefs.glade (original)
+++ trunk/ui/prefs.glade Sun Feb 15 23:05:00 2009
@@ -37,6 +37,7 @@
<child>
<widget class="GtkNotebook" id="notebook">
<property name="visible">True</property>
+ <property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<widget class="GtkLabel" id="label1">
@@ -604,23 +605,29 @@
<property name="column_spacing">7</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label7">
+ <widget class="GtkColorButton" id="cp_background">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Font:</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
</widget>
<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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label8">
+ <widget class="GtkColorButton" id="cp_foreground">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Foreground color:</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
</widget>
<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="x_options">GTK_FILL</property>
@@ -628,27 +635,14 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Background color:</property>
- </widget>
- <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>
- <widget class="GtkLabel" id="label10">
+ <widget class="GtkFontButton" id="fp_font">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Color palette:</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -659,221 +653,221 @@
<property name="n_rows">2</property>
<property name="n_columns">8</property>
<child>
- <widget class="GtkColorButton" id="cp0">
+ <widget class="GtkColorButton" id="cp15">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
+ <property name="left_attach">7</property>
+ <property name="right_attach">8</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>
- <widget class="GtkColorButton" id="cp1">
+ <widget class="GtkColorButton" id="cp14">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</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>
- <widget class="GtkColorButton" id="cp2">
+ <widget class="GtkColorButton" id="cp13">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</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>
- <widget class="GtkColorButton" id="cp3">
+ <widget class="GtkColorButton" id="cp12">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</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>
- <widget class="GtkColorButton" id="cp4">
+ <widget class="GtkColorButton" id="cp11">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
+ <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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="cp5">
+ <widget class="GtkColorButton" id="cp10">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
+ <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>
- <widget class="GtkColorButton" id="cp6">
+ <widget class="GtkColorButton" id="cp9">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
+ <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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="cp7">
+ <widget class="GtkColorButton" id="cp8">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">7</property>
- <property name="right_attach">8</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>
- <widget class="GtkColorButton" id="cp8">
+ <widget class="GtkColorButton" id="cp7">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">7</property>
+ <property name="right_attach">8</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="cp9">
+ <widget class="GtkColorButton" id="cp6">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<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="left_attach">6</property>
+ <property name="right_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="cp10">
+ <widget class="GtkColorButton" id="cp5">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<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="left_attach">5</property>
+ <property name="right_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="cp11">
+ <widget class="GtkColorButton" id="cp4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<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="left_attach">4</property>
+ <property name="right_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="cp12">
+ <widget class="GtkColorButton" id="cp3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="cp13">
+ <widget class="GtkColorButton" id="cp2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <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>
- <widget class="GtkColorButton" id="cp14">
+ <widget class="GtkColorButton" id="cp1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="cp15">
+ <widget class="GtkColorButton" id="cp0">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">7</property>
- <property name="right_attach">8</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>
@@ -889,27 +883,38 @@
</packing>
</child>
<child>
- <widget class="GtkFontButton" id="fp_font">
+ <widget class="GtkLabel" id="label10">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Color palette:</property>
</widget>
<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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="cp_foreground">
+ <widget class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Background color:</property>
+ </widget>
+ <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>
+ <widget class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Foreground color:</property>
</widget>
<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="x_options">GTK_FILL</property>
@@ -917,16 +922,12 @@
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="cp_background">
+ <widget class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Font:</property>
</widget>
<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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
