Mailinglist Archive: opensuse-commit (1124 mails)

< Previous Next >
commit control-center2
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 06 Apr 2007 00:13:35 +0200
  • Message-id: <20070405221335.E2CF467817E@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package control-center2
checked in at Fri Apr 6 00:13:35 CEST 2007.

--------
--- GNOME/control-center2/control-center2.changes       2007-04-02 19:23:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/control-center2/control-center2.changes        2007-04-05 18:06:08.681687000 +0200
@@ -1,0 +2,6 @@
+Thu Apr  5 17:29:51 CEST 2007 - sbrabec@xxxxxxx
+
+- Added "Use default web browser" option for default applications
+  FTP preferences (#113104#c13).
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ control-center2.spec ++++++
--- /var/tmp/diff_new_pack.E25400/_old  2007-04-06 00:13:13.000000000 +0200
+++ /var/tmp/diff_new_pack.E25400/_new  2007-04-06 00:13:13.000000000 +0200
@@ -18,7 +18,7 @@
 Obsoletes:      fontilus themus acme
 Provides:       fontilus themus acme
 Version:        2.18.0
-Release:        3
+Release:        4
 Summary:        The GNOME Control Center for the GNOME 2.x Desktop
 Source:         %{_name}-%{version}.tar.bz2
 Source1:        control-center-art.tar.bz2
@@ -34,10 +34,6 @@
 Patch12:        size.patch
 Patch13:        gnomecc-docpath.patch
 Patch14:        control-center2-system-proxy-configuration.diff
-# FIXME:
-# FTP Client settings need "Open in new Window/Tab", too.
-# Or better: One value should be "Use default Web Browser" and others
-# will not need it.
 Patch15:        control-center-default-applications-ftp+news.patch
 # control-center-default-applications-ftp+news.patch refers to folder-remote icon:
 Requires:       gnome-icon-theme
@@ -237,6 +233,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Apr 05 2007 - sbrabec@xxxxxxx
+- Added "Use default web browser" option for default applications
+  FTP preferences (#113104#c13).
 * Mon Apr 02 2007 - sbrabec@xxxxxxx
 - Ported control-center-default-applications-ftp+news.patch
   (#113104#c11).


++++++ control-center-default-applications-ftp+news.patch ++++++
--- /var/tmp/diff_new_pack.E25400/_old  2007-04-06 00:13:14.000000000 +0200
+++ /var/tmp/diff_new_pack.E25400/_new  2007-04-06 00:13:14.000000000 +0200
@@ -1,7 +1,3 @@
-FIXME:
-FTP Client settings need "Open in new Window/Tab", too.
-Or better: One value should be "Use default Web Browser" and others will not need it.
-================================================================================
 --- capplets/default-applications/gnome-da-capplet.c
 +++ capplets/default-applications/gnome-da-capplet.c
 @@ -63,9 +63,15 @@
@@ -36,7 +32,7 @@
  
      if (error != NULL) {
        g_warning (_("Error saving configuration: %s"), error->message);
-@@ -217,6 +229,57 @@
+@@ -217,6 +229,79 @@
  }
        
  static void
@@ -50,20 +46,21 @@
 +    GConfChangeSet *cs;
 +    GError *error = NULL;
 +    char *ftp_cmd;
-+    
++    gboolean ftp_term;
++
 +    gtk_combo_box_get_active_iter (combo, &iter);
 +    path = gtk_tree_model_get_path (gtk_combo_box_get_model (combo), &iter);
 +    current_index = gtk_tree_path_get_indices (path)[0];
 +    gtk_tree_path_free (path);
 +
-+    if (current_index < g_list_length (capplet->ftp_clients)) {
-+      item = (GnomeDAFtpItem*) g_list_nth_data (capplet->ftp_clients, current_index);
++    if (current_index == 0) {
 +      is_custom_active = FALSE;
-+
 +      cs = gconf_change_set_new ();
-+
-+      gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_FTP_EXEC, item->generic.command);
-+      gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, item->run_in_terminal);
++      ftp_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL);
++      gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_FTP_EXEC, ftp_cmd);
++      g_free (ftp_cmd);
++      ftp_term = gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, NULL);
++      gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, ftp_term);
 +
 +      gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
 +
@@ -72,11 +69,32 @@
 +          g_error_free (error);
 +          error = NULL;
 +      }
-+
-+      gconf_change_set_unref (cs);
 +    }
 +    else {
-+      is_custom_active = TRUE;
++      current_index--;
++      if (current_index < g_list_length (capplet->ftp_clients)) {
++          item = (GnomeDAFtpItem*) g_list_nth_data (capplet->ftp_clients, current_index);
++          is_custom_active = FALSE;
++
++          cs = gconf_change_set_new ();
++
++          gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_FTP_EXEC, item->generic.command);
++          gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, item->run_in_terminal);
++
++          gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
++
++          if (error != NULL) {
++              g_warning (_("Error saving configuration: %s"), error->message);
++              g_error_free (error);
++              error = NULL;
++          }
++
++          gconf_change_set_unref (cs);
++      }
++      else {
++          is_custom_active = TRUE;
++      }
++
 +    }
 +
 +    ftp_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_FTP_EXEC, NULL);
@@ -94,7 +112,7 @@
  mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
  {
      GtkTreeIter iter;
-@@ -268,6 +331,57 @@
+@@ -268,6 +353,57 @@
  }
  
  static void
@@ -152,7 +170,7 @@
  terminal_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
  {
      GtkTreeIter iter;
-@@ -351,7 +465,9 @@
+@@ -351,7 +487,9 @@
      const gchar *icon;
  } icons[] = {
      { "web_browser_image", "web-browser"      },
@@ -162,7 +180,7 @@
  /*    { "messenger_image",   "im"               },
   *    { "image_image",       "image-viewer"     },
   *    { "sound_image",       "gnome-audio"      },
-@@ -372,7 +488,9 @@
+@@ -372,7 +510,9 @@
      }
  
      refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers);
@@ -172,7 +190,7 @@
      refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals);
  }
  
-@@ -496,6 +614,35 @@
+@@ -496,6 +636,42 @@
  }
  
  static void
@@ -182,16 +200,23 @@
 +    gint index;
 +    gboolean is_custom_active;
 +
-+    entry = g_list_find_custom (capplet->ftp_clients, command, (GCompareFunc) generic_item_comp);
-+
-+    if (entry) {
-+      index = g_list_position (capplet->ftp_clients, entry);
++    if (!strcmp (command, gtk_entry_get_text (GTK_ENTRY (capplet->web_browser_command_entry)))) {
 +      is_custom_active = FALSE;
++      index = 0;
 +    }
 +    else {
-+      /* index of 'Custom' combo box entry */
-+      index = g_list_length (capplet->ftp_clients) + 1;
-+      is_custom_active = TRUE;
++
++      entry = g_list_find_custom (capplet->ftp_clients, command, (GCompareFunc) generic_item_comp);
++
++      if (entry) {
++          index = g_list_position (capplet->ftp_clients, entry) + 1;
++          is_custom_active = FALSE;
++      }
++      else {
++          /* index of 'Custom' combo box entry */
++          index = g_list_length (capplet->ftp_clients) + 2;
++          is_custom_active = TRUE;
++      }
 +    }
 +
 +    gtk_entry_set_text (GTK_ENTRY (capplet->ftp_client_command_entry), command);
@@ -208,7 +233,7 @@
  mail_reader_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
  {
      GList *entry;
-@@ -525,6 +672,35 @@
+@@ -525,6 +701,35 @@
  }
  
  static void
@@ -244,7 +269,48 @@
  terminal_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
  {
      GList *entry;
-@@ -632,6 +808,26 @@
+@@ -562,11 +767,20 @@
+     GError *error = NULL;
+     GList *list_entry;

++    GtkTreeIter iter;
++    GtkTreePath *path;
++    guint current_index;
++
+     g_return_if_fail (gconf_entry_get_key (entry) != NULL);

+     if (!(value = gconf_entry_get_value (entry)))
+       return;

++    gtk_combo_box_get_active_iter (GTK_COMBO_BOX (capplet->ftp_combo_box), &iter);
++    path = gtk_tree_model_get_path (gtk_combo_box_get_model (GTK_COMBO_BOX (capplet->ftp_combo_box)), &iter);
++    current_index = gtk_tree_path_get_indices (path)[0];
++    gtk_tree_path_free (path);
++
+     if (strcmp (entry->key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) {
+       gchar *short_browser, *pos;
+       const gchar *value_str = gconf_value_get_string (value);
+@@ -579,6 +793,9 @@
+       gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value);
+       gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value);
+       gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, value);
++      if (current_index == 0) {
++          gconf_change_set_set (cs, DEFAULT_APPS_KEY_FTP_EXEC, value);
++      }
+       pos = strstr (value_str, " ");
+       if (pos == NULL)
+           short_browser = g_strdup (value_str);
+@@ -618,6 +835,9 @@
+       gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value);
+       gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value);
+       gconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value);
++      if (current_index == 0) {
++          gconf_change_set_set (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, value);
++      }

+       gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);

+@@ -632,6 +852,26 @@
  }
  
  static void
@@ -271,7 +337,7 @@
  mail_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
  {
      GConfValue *value;
-@@ -652,6 +848,26 @@
+@@ -652,6 +892,26 @@
  }
  
  static void
@@ -298,7 +364,50 @@
  term_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
  {
      GConfValue *value;
-@@ -781,24 +997,36 @@
+@@ -685,7 +945,7 @@
+ }

+ static void
+-fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list)
++fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list, gboolean ftp)
+ {
+     GList *entry;
+     GtkTreeModel *model;
+@@ -697,8 +957,13 @@
+       theme = gtk_icon_theme_get_default ();
+     }

+-    gtk_combo_box_set_row_separator_func (combo_box, is_separator,
+-                                        GINT_TO_POINTER (g_list_length (app_list)), NULL);
++    if (ftp)
++      /* FIXME: Add one another separator between Default web browser and list. */
++      gtk_combo_box_set_row_separator_func (combo_box, is_separator,
++                                            GINT_TO_POINTER (g_list_length (app_list)+1), NULL);
++    else
++      gtk_combo_box_set_row_separator_func (combo_box, is_separator,
++                                            GINT_TO_POINTER (g_list_length (app_list)), NULL);

+     model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING));
+     gtk_combo_box_set_model (combo_box, model);
+@@ -718,6 +983,17 @@
+                                   "text", TEXT_COL,
+                                   NULL);

++    if (ftp) {
++      pixbuf = gtk_icon_theme_load_icon (theme, "web-browser", 22, 0, NULL);
++      gtk_list_store_append (GTK_LIST_STORE (model), &iter);
++      gtk_list_store_set (GTK_LIST_STORE (model), &iter,
++                          PIXBUF_COL, pixbuf,
++                          TEXT_COL, _("Use default web browser"),
++                          -1);
++      if (pixbuf)
++          g_object_unref (pixbuf);
++    }
++
+     for (entry = app_list; entry != NULL; entry = g_list_next (entry)) {
+       GnomeDAItem *item;
+       item = (GnomeDAItem *) entry->data;
+@@ -781,25 +1057,37 @@
      capplet->new_win_radiobutton = glade_xml_get_widget (capplet->xml, "web_browser_new_win_radiobutton");
      capplet->new_tab_radiobutton = glade_xml_get_widget (capplet->xml, "web_browser_new_tab_radiobutton");
  
@@ -328,14 +437,18 @@
      g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet);
      screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet);
  
-     fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers);
-+    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->ftp_combo_box), capplet->ftp_clients);
-     fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers);
-+    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->news_combo_box), capplet->news_readers);
-     fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals);
+-    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers);
+-    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers);
+-    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals);
++    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, FALSE);
++    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->ftp_combo_box), capplet->ftp_clients, TRUE);
++    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, FALSE);
++    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->news_combo_box), capplet->news_readers, FALSE);
++    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals, FALSE);
  
      /* update ui to gconf content */
-@@ -818,6 +1046,21 @@
+     value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL);
+@@ -818,6 +1106,21 @@
        gconf_value_free (value);
      }
  
@@ -357,7 +470,7 @@
      value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MAILER_EXEC, NULL);
      if (value)
      {
-@@ -833,6 +1076,21 @@
+@@ -833,6 +1136,21 @@
        gconf_value_free (value);
      }
  
@@ -379,7 +492,7 @@
      if (value)
      {
        value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC, NULL);
-@@ -849,18 +1107,26 @@
+@@ -849,18 +1167,26 @@
      }
  
      g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet);
@@ -406,7 +519,7 @@
      g_signal_connect (capplet->terminal_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
      g_signal_connect (capplet->terminal_exec_flag_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
  
-@@ -903,9 +1169,15 @@
+@@ -903,9 +1229,15 @@
      gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_HTTP_PATH,
                             (GConfClientNotifyFunc) web_gconf_changed_cb,
                             capplet, NULL, NULL);
@@ -1076,7 +1189,7 @@
              <property name="tab_expand">False</property>
 --- capplets/default-applications/gnome-default-applications.xml.in
 +++ capplets/default-applications/gnome-default-applications.xml.in
-@@ -145,6 +145,163 @@
+@@ -145,6 +145,25 @@
      </web-browser>
    </web-browsers>
  
@@ -1090,144 +1203,6 @@
 +      <netscape-remote>false</netscape-remote>
 +    </ftp-client>
 +    <ftp-client>
-+      <_name>Opera</_name>
-+      <executable>opera</executable>
-+      <command>opera %s</command>
-+      <icon-name>opera</icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>true</netscape-remote>
-+      <tab-command>opera -newpage %s</tab-command>
-+      <win-command>opera -newwindow %s</win-command>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Debian Sensible Browser</_name>
-+      <executable>sensible-browser</executable>
-+      <command>sensible-browser %s</command>
-+      <icon-name></icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>false</netscape-remote>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Epiphany Web Browser</_name>
-+      <executable>epiphany</executable>
-+      <command>epiphany %s</command>
-+      <icon-name>web-browser</icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>true</netscape-remote>
-+      <tab-command>epiphany --new-tab %s</tab-command>
-+      <win-command>epiphany --new-window %s</win-command>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Galeon</_name>
-+      <executable>galeon</executable>
-+      <command>galeon %s</command>
-+      <icon-name>galeon</icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>true</netscape-remote>
-+      <tab-command>galeon -n %s</tab-command>
-+      <win-command>galeon -w %s</win-command>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Encompass</_name>
-+      <executable>encompass</executable>
-+      <command>encompass %s</command>
-+      <icon-name>encompass</icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>false</netscape-remote>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Firebird</_name>
-+      <executable>mozilla-firebird</executable>
-+      <command>mozilla-firebird %s</command>
-+      <icon-name></icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>true</netscape-remote>
-+      <tab-command>mozilla-firebird -remote "openurl(%s,new-tab)"</tab-command>
-+      <win-command>mozilla-firebird -remote "openurl(%s,new-window)"</win-command>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Firefox</_name>
-+      <executable>firefox</executable>
-+      <command>firefox %s</command>
-+      <icon-name>firefox</icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>true</netscape-remote>
-+      <tab-command>firefox -remote "openurl(%s,new-tab)"</tab-command>
-+      <win-command>firefox -remote "openurl(%s,new-window)"</win-command>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Iceweasel</_name>
-+      <executable>iceweasel</executable>
-+      <command>iceweasel %s</command>
-+      <icon-name>iceweasel</icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>true</netscape-remote>
-+      <tab-command>iceweasel -remote "openurl(%s,new-tab)"</tab-command>
-+      <win-command>iceweasel -remote "openurl(%s,new-window)"</win-command>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Mozilla 1.6</_name>
-+      <executable>mozilla-1.6</executable>
-+      <command>mozilla-1.6 %s</command>
-+      <icon-name>mozilla-icon</icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>true</netscape-remote>
-+      <tab-command>mozilla-1.6 -remote "openurl(%s,new-tab)"</tab-command>
-+      <win-command>mozilla-1.6 -remote "openurl(%s,new-window)"</win-command>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Mozilla</_name>
-+      <executable>mozilla</executable>
-+      <command>mozilla %s</command>
-+      <icon-name>mozilla-icon</icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>true</netscape-remote>
-+      <tab-command>mozilla -remote "openurl(%s,new-tab)"</tab-command>
-+      <win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Netscape Communicator</_name>
-+      <executable>netscape</executable>
-+      <command>netscape %s</command>
-+      <icon-name>netscape</icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>true</netscape-remote>
-+      <tab-command>netscape -remote "openurl(%s,new-tab)"</tab-command>
-+      <win-command>netscape -remote "openurl(%s,new-window)"</win-command>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Konqueror</_name>
-+      <executable>konqueror</executable>
-+      <command>konqueror %s</command>
-+      <icon-name>konqueror</icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>false</netscape-remote>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>W3M Text Browser</_name>
-+      <executable>w3m</executable>
-+      <command>w3m %s</command>
-+      <icon-name>gnome-mime-application-x-executable</icon-name>
-+      <run-in-terminal>true</run-in-terminal>
-+      <netscape-remote>false</netscape-remote>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Lynx Text Browser</_name>
-+      <executable>lynx</executable>
-+      <command>lynx %s</command>
-+      <icon-name>gnome-mime-application-x-executable</icon-name>
-+      <run-in-terminal>true</run-in-terminal>
-+      <netscape-remote>false</netscape-remote>
-+    </ftp-client>
-+    <ftp-client>
-+      <_name>Links Text Browser</_name>
-+      <executable>links</executable>
-+      <command>links %s</command>
-+      <icon-name>gnome-mime-application-x-executable</icon-name>
-+      <run-in-terminal>true</run-in-terminal>
-+      <netscape-remote>false</netscape-remote>
-+    </ftp-client>
-+    <ftp-client>
 +      <_name>gFTP</_name>
 +      <executable>gftp</executable>
 +      <command>gftp %s</command>
@@ -1240,7 +1215,7 @@
    <mail-readers>
      <mail-reader>
        <_name>Evolution Mail Reader 2.4</_name>
-@@ -267,6 +424,52 @@
+@@ -267,6 +286,52 @@
      </mail-reader>
    </mail-readers>
  

++++++ control-center-seamonkey.patch ++++++
--- /var/tmp/diff_new_pack.E25400/_old  2007-04-06 00:13:14.000000000 +0200
+++ /var/tmp/diff_new_pack.E25400/_new  2007-04-06 00:13:14.000000000 +0200
@@ -17,24 +17,7 @@
        <_name>Netscape Communicator</_name>
        <executable>netscape</executable>
        <command>netscape %s</command>
-@@ -251,6 +261,16 @@
-       <win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
-     </ftp-client>
-     <ftp-client>
-+      <_name>SeaMonkey</_name>
-+      <executable>seamonkey</executable>
-+      <command>seamonkey %s</command>
-+      <icon-name>seamonkey</icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+      <netscape-remote>true</netscape-remote>
-+      <tab-command>seamonkey -remote "openurl(%s,new-tab)"</tab-command>
-+      <win-command>seamonkey -remote "openurl(%s,new-window)"</win-command>
-+    </ftp-client>
-+    <ftp-client>
-       <_name>Netscape Communicator</_name>
-       <executable>netscape</executable>
-       <command>netscape %s</command>
-@@ -395,6 +415,13 @@
+@@ -257,6 +267,13 @@
        <run-in-terminal>false</run-in-terminal>
      </mail-reader>
      <mail-reader>
@@ -48,17 +31,17 @@
        <_name>Mutt</_name>
        <executable>mutt</executable>
        <command>mutt %s</command>
-@@ -460,6 +487,13 @@
-       <tab-command>mozilla -news -remote "openurl(%s,new-tab)"</tab-command>
+@@ -323,6 +340,13 @@
        <win-command>mozilla -news -remote "openurl(%s,new-window)"</win-command>
      </news-reader>
-+    <news-reader>
+     <news-reader>
 +      <_name>SeaMonkey News</_name>
 +      <executable>seamonkey</executable>
 +      <command>seamonkey -news %s</command>
 +      <icon-name>seamonkey</icon-name>
 +      <run-in-terminal>false</run-in-terminal>
 +    </news-reader>
-     <news-reader>
++    <news-reader>
        <_name>TIN News Reader</_name>
        <executable>tin</executable>
+       <command>tin %s</command>



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >