empathy r2874 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Thu Apr 16 12:29:44 2009
New Revision: 2874
URL: http://svn.gnome.org/viewvc/empathy?rev=2874&view=rev

Log:
Remove unused edit-chatroom dialog from the UI file. gtk_builder_add_from_file creates all toplevel objects so the edit dialog popup in the same time as the manage chatroom dialog.

From: Xavier Claessens <xclaesse gmail com>

Modified:
   trunk/src/empathy-chatrooms-window.c
   trunk/src/empathy-chatrooms-window.ui

Modified: trunk/src/empathy-chatrooms-window.c
==============================================================================
--- trunk/src/empathy-chatrooms-window.c	(original)
+++ trunk/src/empathy-chatrooms-window.c	Thu Apr 16 12:29:44 2009
@@ -437,21 +437,7 @@
 static void
 chatrooms_window_model_action_selected (EmpathyChatroomsWindow *window)
 {
-	EmpathyChatroom *chatroom;
-	GtkTreeView    *view;
-	GtkTreeModel   *model;
-
-	view = GTK_TREE_VIEW (window->treeview);
-	model = gtk_tree_view_get_model (view);
-
-	chatroom = chatrooms_window_model_get_selected (window);
-	if (!chatroom) {
-		return;
-	}
-
-	//empathy_edit_chatroom_dialog_show (GTK_WINDOW (window->window), chatroom);
-
-	g_object_unref (chatroom);
+	/* FIXME: This is still not implemented since Gossip fork */
 }
 
 static void
@@ -496,16 +482,7 @@
 chatrooms_window_button_edit_clicked_cb (GtkWidget             *widget,
 					 EmpathyChatroomsWindow *window)
 {
-	EmpathyChatroom *chatroom;
-
-	chatroom = chatrooms_window_model_get_selected (window);
-	if (!chatroom) {
-		return;
-	}
-
-	//empathy_edit_chatroom_dialog_show (GTK_WINDOW (window->window), chatroom);
-
-	g_object_unref (chatroom);
+	/* FIXME: This is still not implemented since Gossip fork */
 }
 
 static void

Modified: trunk/src/empathy-chatrooms-window.ui
==============================================================================
--- trunk/src/empathy-chatrooms-window.ui	(original)
+++ trunk/src/empathy-chatrooms-window.ui	Thu Apr 16 12:29:44 2009
@@ -1,201 +1,6 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
-  <object class="GtkDialog" id="edit_chatroom_dialog">
-    <property name="visible">True</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Edit Favorite Room</property>
-    <property name="resizable">False</property>
-    <property name="role">chatrooms</property>
-    <property name="icon_name">gtk-edit</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkTable" id="table4">
-            <property name="visible">True</property>
-            <property name="border_width">5</property>
-            <property name="n_rows">5</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">12</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="checkbutton_auto_connect">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip-text" translatable="yes">Join this chat room when Empathy starts and you are connected</property>
-                <property name="label" translatable="yes">Join room on start_up</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">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="x_options">GTK_FILL</property>
-                <property name="y_options"/>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_name">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="width_chars">25</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options"/>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_name">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">N_ame:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_name</property>
-              </object>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"/>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_nickname">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Nickname:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_nickname</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"/>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_server">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">S_erver:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_server</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"/>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_room">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Room:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_room</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"/>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_nickname">
-                <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"/>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_server">
-                <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"/>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_room">
-                <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"/>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area3">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <object class="GtkButton" id="button_cancel">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">True</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="button_save">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label">gtk-save</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">checkbutton_auto_connect</action-widget>
-      <action-widget response="-6">button_cancel</action-widget>
-      <action-widget response="-5">button_save</action-widget>
-    </action-widgets>
-  </object>
   <object class="GtkWindow" id="chatrooms_window">
     <property name="visible">True</property>
     <property name="border_width">12</property>