Changeset 18

Timestamp:

Jan 12, 2006, 6:56:00 PM (15 years ago)

Author:

root

Message:

Update 2005-12-19

Location:

trunk/gtk

Files:

• gtkcellrenderertorrent.c (modified) (1 diff)
• gtkcellrenderertorrent.h (modified) (1 diff)
• main.c (modified) (3 diffs)
• prefs.c (modified) (3 diffs)

trunk/gtk/gtkcellrenderertorrent.c

@@ -108 +108 @@
 }
 
+/* XXX need to do this better somehow */
+void
+gtk_cell_renderer_torrent_reset_style(GtkCellRendererTorrent *tor) {
+  if(NULL != tor->priv->style) {
+    gtk_style_detach(tor->priv->style);
+    gtk_style_unref(tor->priv->style);
+    tor->priv->style = NULL;
+  }
+}
+
 static void
 finalize(GObject *object) {

trunk/gtk/gtkcellrenderertorrent.h

@@ -64 +64 @@
 GType            gtk_cell_renderer_torrent_get_type (void) G_GNUC_CONST;
 GtkCellRenderer* gtk_cell_renderer_torrent_new      (void);
+void gtk_cell_renderer_torrent_reset_style(GtkCellRendererTorrent *);
 
 G_END_DECLS

trunk/gtk/main.c

@@ -81 +81 @@
 GtkWidget *
 makewind_list(struct cbdata *data);
+static void
+stylekludge(GObject *obj, GParamSpec *spec, gpointer gdata);
 void
 fixbuttons(GtkTreeSelection *sel, gpointer gdata);
@@ -439 +441 @@
   gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
 
+  /* XXX this shouldn't be necessary */
+  g_signal_connect(view, "notify", G_CALLBACK(stylekludge), progrend);
+
   gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE);
   sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
@@ -449 +454 @@
 
   return view;
+}
+
+/* kludge to have the progress bars notice theme changes */
+static void
+stylekludge(GObject *obj, GParamSpec *spec, gpointer gdata) {
+  if(0 == strcmp("style", spec->name)) {
+    gtk_cell_renderer_torrent_reset_style(GTK_CELL_RENDERER_TORRENT(gdata));
+    gtk_widget_queue_draw(GTK_WIDGET(obj));
+  }
 }
 

trunk/gtk/prefs.c

@@ -141 +141 @@
   int intval;
   const char *strval;
-  char *strnum;
+  char *strnum, *errstr;
   gboolean boolval;
 
@@ -147 +147 @@
     /* check directory */
     strval = gtk_entry_get_text(data->dir);
-    if(!mkdir_p(strval, 0777)) {
+    if('\0' != strval[0] &&!mkdir_p(strval, 0777)) {
       errmsg(data->parent, "Failed to create directory %s:\n%s",
              strval, strerror(errno));
       return;
     }
+
+    /* save dir pref */
+    cf_setpref(PREF_DIR, gtk_entry_get_text(data->dir), NULL);
 
     /* save port pref */
@@ -167 +170 @@
     intval = gtk_spin_button_get_value_as_int(data->limit);
     strnum = g_strdup_printf("%i", intval);
-    cf_setpref(PREF_LIMIT, strnum, NULL);
-    g_free(strnum);
-
-    setlimit(data->tr);
-
     /*
       note that prefs aren't written to disk unless we pass a pointer
       to an error string, so do this for the last call to cf_setpref()
     */
-    /* save dir pref */
-    if(!cf_setpref(PREF_DIR, gtk_entry_get_text(data->dir), &strnum)) {
-      errmsg(data->parent, "%s", strnum);
+    if(!cf_setpref(PREF_LIMIT, strnum, &errstr)) {
+      errmsg(data->parent, "%s", errstr);
       g_free(strnum);
-      return;
+      g_free(errstr);
     }
+
+    setlimit(data->tr);
   }